Merge pull request #5145 from pks-t/pks/hash-algo-uninit-return

pks-t · web-flow · commit c4c1500a8bc9 · 2019-06-27T14:18:19.000+02:00
hash: fix missing error return on production builds
diff --git a/src/hash.c b/src/hash.c
@@ -42,6 +42,7 @@ int git_hash_init(git_hash_ctx *ctx)
 			return git_hash_sha1_init(&ctx->sha1);
 		default:
 			assert(0);
+			return -1;
 	}
 }
 
@@ -52,6 +53,7 @@ int git_hash_update(git_hash_ctx *ctx, const void *data, size_t len)
 			return git_hash_sha1_update(&ctx->sha1, data, len);
 		default:
 			assert(0);
+			return -1;
 	}
 }
 
@@ -62,6 +64,7 @@ int git_hash_final(git_oid *out, git_hash_ctx *ctx)
 			return git_hash_sha1_final(out, &ctx->sha1);
 		default:
 			assert(0);
+			return -1;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ int git_hash_init(git_hash_ctx *ctx)`
`42`	`42`	`return git_hash_sha1_init(&ctx->sha1);`
`43`	`43`	`default:`
`44`	`44`	`assert(0);`
	`45`	`+ return -1;`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`
`@@ -52,6 +53,7 @@ int git_hash_update(git_hash_ctx ctx, const void data, size_t len)`
`52`	`53`	`return git_hash_sha1_update(&ctx->sha1, data, len);`
`53`	`54`	`default:`
`54`	`55`	`assert(0);`
	`56`	`+ return -1;`
`55`	`57`	`}`
`56`	`58`	`}`
`57`	`59`
`@@ -62,6 +64,7 @@ int git_hash_final(git_oid out, git_hash_ctx ctx)`
`62`	`64`	`return git_hash_sha1_final(out, &ctx->sha1);`
`63`	`65`	`default:`
`64`	`66`	`assert(0);`
	`67`	`+ return -1;`
`65`	`68`	`}`
`66`	`69`	`}`
`67`	`70`