emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

md5/sha1sum: better fix for small resource leak

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-04-16 18:56:36 +02:00
parent 88a8384388
commit 43a3d50e14
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
coreutils/md5_sha1_sum.c
View File

@ -100,22 +100,18 @@ static uint8_t *hash_file(const char *filename)
md5_ctx_t md5; md5_ctx_t md5;
} context; } context;
uint8_t *hash_value = NULL; uint8_t *hash_value = NULL;
RESERVE_CONFIG_UBUFFER(in_buf, 4096);
void FAST_FUNC (*update)(void*, const void*, size_t); void FAST_FUNC (*update)(void*, const void*, size_t);
void FAST_FUNC (*final)(void*, void*); void FAST_FUNC (*final)(void*, void*);
char hash_algo; char hash_algo;
src_fd = open_or_warn_stdin(filename); src_fd = open_or_warn_stdin(filename);
if (src_fd < 0) { if (src_fd < 0) {
if (ENABLE_FEATURE_CLEAN_UP) {
RELEASE_CONFIG_BUFFER(in_buf);
}
return NULL; return NULL;
} }
hash_algo = applet_name[3]; hash_algo = applet_name[3];
/* figure specific hash algorithims */ /* figure specific hash algorithms */
if (ENABLE_MD5SUM && hash_algo == HASH_MD5) { if (ENABLE_MD5SUM && hash_algo == HASH_MD5) {
md5_begin(&context.md5); md5_begin(&context.md5);
update = (void*)md5_hash; update = (void*)md5_hash;
@ -140,17 +136,18 @@ static uint8_t *hash_file(const char *filename)
xfunc_die(); /* can't reach this */ xfunc_die(); /* can't reach this */
} }
while ((count = safe_read(src_fd, in_buf, 4096)) > 0) { {
update(&context, in_buf, count); RESERVE_CONFIG_UBUFFER(in_buf, 4096);
while ((count = safe_read(src_fd, in_buf, 4096)) > 0) {
update(&context, in_buf, count);
}
if (count == 0) {
final(&context, in_buf);
hash_value = hash_bin_to_hex(in_buf, hash_len);
}
RELEASE_CONFIG_BUFFER(in_buf);
} }
if (count == 0) {
final(&context, in_buf);
hash_value = hash_bin_to_hex(in_buf, hash_len);
}
RELEASE_CONFIG_BUFFER(in_buf);
if (src_fd != STDIN_FILENO) { if (src_fd != STDIN_FILENO) {
close(src_fd); close(src_fd);
} }