thodg/libgit2/src/hash.c

• Show log

  Commit

• Hash : 7fd3f32b
  Author :
  Date : 2019-06-27T13:54:55
  

  hash: fix missing error return on production builds When no hash algorithm has been initialized in a given hash context, then we will simply `assert` and not return a value at all. This works just fine in debug builds, but on non-debug builds the assert will be converted to a no-op and thus we do not have a proper return value. Fix this by returning an error code in addition to the asserts.

Download

• src/hash.c

• /*
   * Copyright (C) the libgit2 contributors. All rights reserved.
   *
   * This file is part of libgit2, distributed under the GNU GPL v2 with
   * a Linking Exception. For full terms see the included COPYING file.
   */
  
  #include "hash.h"
  
  int git_hash_global_init(void)
  {
  	return git_hash_sha1_global_init();
  }
  
  int git_hash_ctx_init(git_hash_ctx *ctx)
  {
  	int error;
  
  	if ((error = git_hash_sha1_ctx_init(&ctx->sha1)) < 0)
  		return error;
  
  	ctx->algo = GIT_HASH_ALGO_SHA1;
  
  	return 0;
  }
  
  void git_hash_ctx_cleanup(git_hash_ctx *ctx)
  {
  	switch (ctx->algo) {
  		case GIT_HASH_ALGO_SHA1:
  			git_hash_sha1_ctx_cleanup(&ctx->sha1);
  			return;
  		default:
  			assert(0);
  	}
  }
  
  int git_hash_init(git_hash_ctx *ctx)
  {
  	switch (ctx->algo) {
  		case GIT_HASH_ALGO_SHA1:
  			return git_hash_sha1_init(&ctx->sha1);
  		default:
  			assert(0);
  			return -1;
  	}
  }
  
  int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len)
  {
  	switch (ctx->algo) {
  		case GIT_HASH_ALGO_SHA1:
  			return git_hash_sha1_update(&ctx->sha1, data, len);
  		default:
  			assert(0);
  			return -1;
  	}
  }
  
  int git_hash_final(git_oid *out, git_hash_ctx *ctx)
  {
  	switch (ctx->algo) {
  		case GIT_HASH_ALGO_SHA1:
  			return git_hash_sha1_final(out, &ctx->sha1);
  		default:
  			assert(0);
  			return -1;
  	}
  }
  
  int git_hash_buf(git_oid *out, const void *data, size_t len)
  {
  	git_hash_ctx ctx;
  	int error = 0;
  
  	if (git_hash_ctx_init(&ctx) < 0)
  		return -1;
  
  	if ((error = git_hash_update(&ctx, data, len)) >= 0)
  		error = git_hash_final(out, &ctx);
  
  	git_hash_ctx_cleanup(&ctx);
  	
  	return error;
  }
  
  int git_hash_vec(git_oid *out, git_buf_vec *vec, size_t n)
  {
  	git_hash_ctx ctx;
  	size_t i;
  	int error = 0;
  
  	if (git_hash_ctx_init(&ctx) < 0)
  		return -1;
  
  	for (i = 0; i < n; i++) {
  		if ((error = git_hash_update(&ctx, vec[i].data, vec[i].len)) < 0)
  			goto done;
  	}
  
  	error = git_hash_final(out, &ctx);
  
  done:
  	git_hash_ctx_cleanup(&ctx);
  
  	return error;
  }
  

Download