Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

On Wednesday 13 April 2005 09:12 pm, Shaun Jackman wrote:

Browse Source 
> This patch fixes a memory leak in hash_file by using the BUFFER macros
> instead of xmalloc. Please apply.
This commit is contained in:
Rob Landley 2005-04-30 05:11:57 +00:00
parent ad8071f582
commit 6624daeb4d
1 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
coreutils/md5_sha1_sum.c
View File

@ -49,34 +49,21 @@ static unsigned char *hash_bin_to_hex(unsigned char *hash_value,
static uint8_t *hash_file(const char *filename, uint8_t hash_algo) static uint8_t *hash_file(const char *filename, uint8_t hash_algo)
{ {
uint8_t *hash_value_bin; int src_fd = strcmp(filename, "-") == 0 ? STDIN_FILENO :
uint8_t *hash_value = NULL; open(filename, O_RDONLY);
uint8_t hash_length; if (src_fd == -1) {
int src_fd;
if (strcmp(filename, "-") == 0) {
src_fd = STDIN_FILENO;
} else {
src_fd = open(filename, O_RDONLY);
}
if (hash_algo == HASH_MD5) {
hash_length = 16;
} else {
hash_length = 20;
}
hash_value_bin = xmalloc(hash_length);
if ((src_fd != -1) && (hash_fd(src_fd, -1, hash_algo, hash_value_bin) != -2)) {
hash_value = hash_bin_to_hex(hash_value_bin, hash_length);
} else {
bb_perror_msg("%s", filename); bb_perror_msg("%s", filename);
return NULL;
} else {
uint8_t *hash_value;
RESERVE_CONFIG_UBUFFER(hash_value_bin, 20);
hash_value = hash_fd(src_fd, -1, hash_algo, hash_value_bin) != -2 ?
hash_bin_to_hex(hash_value_bin, hash_algo == HASH_MD5 ? 16 : 20) :
NULL;
RELEASE_CONFIG_BUFFER(hash_value_bin);
close(src_fd);
return hash_value;
} }
close(src_fd);
return(hash_value);
} }
/* This could become a common function for md5 as well, by using md5_stream */ /* This could become a common function for md5 as well, by using md5_stream */