clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of ini settings

Browse Source
This commit is contained in:
Marcus Boerger 2003-05-30 17:46:57 +00:00
parent 1eec984976
commit 07ba5f6c9e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/exif/exif.c
View File

@ -3669,6 +3669,16 @@ static int exif_discard_imageinfo(image_info_type *ImageInfo)
} }
/* }}} */ /* }}} */
/* {{{ estrdupx */
static inline char * estrdupx(const char* str)
{
if (str) {
return estrdup(str);
}
return estrdup("");
}
/* }}} */
/* {{{ exif_read_file /* {{{ exif_read_file
*/ */
static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all TSRMLS_DC) static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all TSRMLS_DC)
@ -3692,12 +3702,12 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t
ImageInfo->read_all = read_all; ImageInfo->read_all = read_all;
ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_UNKNOWN; ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_UNKNOWN;
ImageInfo->encode_unicode = estrdup(EXIF_G(encode_unicode)); ImageInfo->encode_unicode = estrdupx(EXIF_G(encode_unicode));
ImageInfo->decode_unicode_be = estrdup(EXIF_G(decode_unicode_be)); ImageInfo->decode_unicode_be = estrdupx(EXIF_G(decode_unicode_be));
ImageInfo->decode_unicode_le = estrdup(EXIF_G(decode_unicode_le)); ImageInfo->decode_unicode_le = estrdupx(EXIF_G(decode_unicode_le));
ImageInfo->encode_jis = estrdup(EXIF_G(encode_jis)); ImageInfo->encode_jis = estrdupx(EXIF_G(encode_jis));
ImageInfo->decode_jis_be = estrdup(EXIF_G(decode_jis_be)); ImageInfo->decode_jis_be = estrdupx(EXIF_G(decode_jis_be));
ImageInfo->decode_jis_le = estrdup(EXIF_G(decode_jis_le)); ImageInfo->decode_jis_le = estrdupx(EXIF_G(decode_jis_le));
if (php_stream_is(ImageInfo->infile, PHP_STREAM_IS_STDIO)) { if (php_stream_is(ImageInfo->infile, PHP_STREAM_IS_STDIO)) {
if (VCWD_STAT(FileName, &st) >= 0) { if (VCWD_STAT(FileName, &st) >= 0) {