mchapman/zlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid use of reallocf() in test/infcover.c.

Browse Source
This commit is contained in:
Mark Adler
2015-07-28 21:55:09 -07:00
parent 0db8fd3714
commit 0b22337126
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/infcover.c
View File

@@ -237,14 +237,14 @@ local void mem_done(z_stream *strm, char *prefix)
/* Decode a hexadecimal string, set *len to length, in[] to the bytes. This /* Decode a hexadecimal string, set *len to length, in[] to the bytes. This
decodes liberally, in that hex digits can be adjacent, in which case two in decodes liberally, in that hex digits can be adjacent, in which case two in
a row writes a byte. Or they can delimited by any non-hex character, where a row writes a byte. Or they can be delimited by any non-hex character,
the delimiters are ignored except when a single hex digit is followed by a where the delimiters are ignored except when a single hex digit is followed
delimiter in which case that single digit writes a byte. The returned by a delimiter, where that single digit writes a byte. The returned data is
data is allocated and must eventually be freed. NULL is returned if out of allocated and must eventually be freed. NULL is returned if out of memory.
memory. If the length is not needed, then len can be NULL. */ If the length is not needed, then len can be NULL. */
local unsigned char *h2b(const char *hex, unsigned *len) local unsigned char *h2b(const char *hex, unsigned *len)
{ {
unsigned char *in; unsigned char *in, *re;
unsigned next, val; unsigned next, val;
in = malloc((strlen(hex) + 1) >> 1); in = malloc((strlen(hex) + 1) >> 1);
@@ -268,8 +268,8 @@ local unsigned char *h2b(const char *hex, unsigned *len)
} while (*hex++); /* go through the loop with the terminating null */ } while (*hex++); /* go through the loop with the terminating null */
if (len != NULL) if (len != NULL)
*len = next; *len = next;
in = reallocf(in, next); re = realloc(in, next);
return in; return re == NULL ? in : re;
} }
/* generic inflate() run, where hex is the hexadecimal input data, what is the /* generic inflate() run, where hex is the hexadecimal input data, what is the