diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-20 00:57:55 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-20 01:00:11 -0800 |
| commit | fc6aa939f59c9be0febe0fa141629e49541bab8c (patch) | |
| tree | 006eb9bba66c530be16b1f45f13ae362ef4f231b /ext/exif/exif.c | |
| parent | 0a766104599fcb285bb9542fa28d2f7baa3d8e16 (diff) | |
| parent | 2fc178cf448d8e1b95d1314e47eeef610729e0df (diff) | |
| download | php-git-fc6aa939f59c9be0febe0fa141629e49541bab8c.tar.gz | |
Merge branch 'bug68799' into PHP-5.4
* bug68799:
Fix bug #68799: Free called on unitialized pointer
Diffstat (limited to 'ext/exif/exif.c')
| -rw-r--r-- | ext/exif/exif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 637ebf9289..7f95ff43ea 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2702,7 +2702,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP static int exif_process_unicode(image_info_type *ImageInfo, xp_field_type *xp_field, int tag, char *szValuePtr, int ByteCount TSRMLS_DC) { xp_field->tag = tag; - + xp_field->value = NULL; /* XXX this will fail again if encoding_converter returns on error something different than SIZE_MAX */ if (zend_multibyte_encoding_converter( (unsigned char**)&xp_field->value, |