summaryrefslogtreecommitdiffstats
path: root/compat/zlib/test/infcover.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2017-06-05 23:20:36 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2017-06-05 23:20:36 (GMT)
commitf8223fa81718da26562fff851b4a56d18b58a62a (patch)
tree2c47bdd025eab065e5f559ade49795a3acaf938e /compat/zlib/test/infcover.c
parente9d31a334b4cbd18716b3c1eacf7f516cbc7286d (diff)
parent0b178367ba3b9a10d44f89025c89292a4ea49b20 (diff)
downloadtcl-dkf_expose_ptrgetvar.zip
tcl-dkf_expose_ptrgetvar.tar.gz
tcl-dkf_expose_ptrgetvar.tar.bz2
Diffstat (limited to 'compat/zlib/test/infcover.c')
-rw-r--r--compat/zlib/test/infcover.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/compat/zlib/test/infcover.c b/compat/zlib/test/infcover.c
index fe3d920..2be0164 100644
--- a/compat/zlib/test/infcover.c
+++ b/compat/zlib/test/infcover.c
@@ -1,5 +1,5 @@
/* infcover.c -- test zlib's inflate routines with full code coverage
- * Copyright (C) 2011 Mark Adler
+ * Copyright (C) 2011, 2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -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
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
- the delimiters are ignored except when a single hex digit is followed by a
- delimiter in which case that single digit writes a byte. The returned
- data is allocated and must eventually be freed. NULL is returned if out of
- memory. If the length is not needed, then len can be NULL. */
+ a row writes a byte. Or they can be delimited by any non-hex character,
+ where the delimiters are ignored except when a single hex digit is followed
+ by a delimiter, where that single digit writes a byte. The returned data is
+ allocated and must eventually be freed. NULL is returned if out of memory.
+ If the length is not needed, then len can be NULL. */
local unsigned char *h2b(const char *hex, unsigned *len)
{
- unsigned char *in;
+ unsigned char *in, *re;
unsigned next, val;
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 */
if (len != NULL)
*len = next;
- in = reallocf(in, next);
- return in;
+ re = realloc(in, next);
+ return re == NULL ? in : re;
}
/* generic inflate() run, where hex is the hexadecimal input data, what is the