oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

check for overflows

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14671 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-03-21 13:31:33 +00:00
parent 694ff5984b
commit 20e1990667
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/roken/hex.c
View File

@@ -60,10 +60,9 @@ hex_encode(const void *data, size_t size, char **str)
size_t i; size_t i;
char *p; char *p;
#ifdef SIZE_T_MAX /* check for overflow */
if (size + 1 > SIZE_T_MAX/2) if (size * 2 < size)
return -1; return -1;
#endif
p = malloc(size * 2 + 1); p = malloc(size * 2 + 1);
if (p == NULL) if (p == NULL)
@@ -88,7 +87,9 @@ hex_decode(const char *str, void *data, size_t len)
size_t i; size_t i;
l = strlen(str); l = strlen(str);
if ((l + 1) / 2 > len)
/* check for overflow, same as (l+1)/2 but overflow safe */
if ((l/2) + (l&1) > len)
return -1; return -1;
for (i = 0; i < l / 2; i++) for (i = 0; i < l / 2; i++)