tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace alloca with xcalloc. 

The latter checks for memory exhaustion and integer overflow and may be
at a less predictable place.  Sanity check by vinschen at redhat.com, ok
djm@
This commit is contained in:
Darren Tucker 2019-03-13 10:49:16 +11:00
parent daa7505aad
commit a212107bfd
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openbsd-compat/bsd-cygwin_util.c
View File

@ -37,6 +37,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h>
#include <wchar.h> #include <wchar.h>
#include <wctype.h> #include <wctype.h>
@ -191,16 +192,20 @@ _match_pattern(const char *s, const char *pattern)
wchar_t *ws; wchar_t *ws;
wchar_t *wpattern; wchar_t *wpattern;
size_t len; size_t len;
int ret;
if ((len = mbstowcs(NULL, s, 0)) < 0) if ((len = mbstowcs(NULL, s, 0)) < 0)
return 0; return 0;
ws = (wchar_t *) alloca((len + 1) * sizeof (wchar_t)); ws = (wchar_t *) xcalloc(len + 1, sizeof (wchar_t));
mbstowcs(ws, s, len + 1); mbstowcs(ws, s, len + 1);
if ((len = mbstowcs(NULL, pattern, 0)) < 0) if ((len = mbstowcs(NULL, pattern, 0)) < 0)
return 0; return 0;
wpattern = (wchar_t *) alloca((len + 1) * sizeof (wchar_t)); wpattern = (wchar_t *) xcalloc(len + 1, sizeof (wchar_t));
mbstowcs(wpattern, pattern, len + 1); mbstowcs(wpattern, pattern, len + 1);
return __match_pattern (ws, wpattern); ret = __match_pattern (ws, wpattern);
free(ws);
free(wpattern);
return ret;
} }
/* /*