diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-12-03 23:19:48 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-12-03 23:21:31 -0800 |
| commit | 07a97b3944467dce085a1efd24706cc851d2caf2 (patch) | |
| tree | 02416ff281f9567a8d9c6298eb8ebbce8067ee98 | |
| parent | 11118e9eb3705fcbe42b6a68d4a8aa86ab0211f1 (diff) | |
Bug 93184: read_EncodingInfo invalid free
Free the correct bits of memory if we run out and need to unwind
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93184
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | modules/om/generic/omGeneric.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c index 610361b5..724f47e4 100644 --- a/modules/om/generic/omGeneric.c +++ b/modules/om/generic/omGeneric.c @@ -1877,13 +1877,13 @@ read_EncodingInfo( { FontData font_data,ret; char *buf, *bufptr,*scp; - int len; + int len, i; font_data = Xcalloc(count, sizeof(FontDataRec)); if (font_data == NULL) return NULL; ret = font_data; - for ( ; count-- > 0; font_data++) { + for (i = 0; i < count; i++, font_data++) { /* strcpy(buf, *value++); */ @@ -1895,7 +1895,8 @@ read_EncodingInfo( len = strlen(buf); font_data->name = Xmalloc(len + 1); if (font_data->name == NULL) { - Xfree(font_data); + free_fontdataOM(ret, i + 1); + Xfree(ret); return NULL; } strncpy(font_data->name, buf,len); |