helly Fri May 30 13:46:57 2003 EDT Modified files: /php4/ext/exif exif.c Log: Fix handling of ini settings Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.146 php4/ext/exif/exif.c:1.147 --- php4/ext/exif/exif.c:1.146 Mon May 5 09:46:14 2003 +++ php4/ext/exif/exif.c Fri May 30 13:46:57 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.146 2003/05/05 13:46:14 hholzgra Exp $ */ +/* $Id: exif.c,v 1.147 2003/05/30 17:46:57 helly Exp $ */ /* ToDos * @@ -99,7 +99,7 @@ }; /* }}} */ -#define EXIF_VERSION "1.4 $Id: exif.c,v 1.146 2003/05/05 13:46:14 hholzgra Exp $" +#define EXIF_VERSION "1.4 $Id: exif.c,v 1.147 2003/05/30 17:46:57 helly Exp $" /* {{{ PHP_MINFO_FUNCTION */ @@ -3669,6 +3669,16 @@ } /* }}} */ +/* {{{ estrdupx */ +static inline char * estrdupx(const char* str) +{ + if (str) { + return estrdup(str); + } + return estrdup(""); +} +/* }}} */ + /* {{{ exif_read_file */ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all TSRMLS_DC) @@ -3692,12 +3702,12 @@ ImageInfo->read_all = read_all; ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_UNKNOWN; - ImageInfo->encode_unicode = estrdup(EXIF_G(encode_unicode)); - ImageInfo->decode_unicode_be = estrdup(EXIF_G(decode_unicode_be)); - ImageInfo->decode_unicode_le = estrdup(EXIF_G(decode_unicode_le)); - ImageInfo->encode_jis = estrdup(EXIF_G(encode_jis)); - ImageInfo->decode_jis_be = estrdup(EXIF_G(decode_jis_be)); - ImageInfo->decode_jis_le = estrdup(EXIF_G(decode_jis_le)); + ImageInfo->encode_unicode = estrdupx(EXIF_G(encode_unicode)); + ImageInfo->decode_unicode_be = estrdupx(EXIF_G(decode_unicode_be)); + ImageInfo->decode_unicode_le = estrdupx(EXIF_G(decode_unicode_le)); + ImageInfo->encode_jis = estrdupx(EXIF_G(encode_jis)); + ImageInfo->decode_jis_be = estrdupx(EXIF_G(decode_jis_be)); + ImageInfo->decode_jis_le = estrdupx(EXIF_G(decode_jis_le)); if (php_stream_is(ImageInfo->infile, PHP_STREAM_IS_STDIO)) { if (VCWD_STAT(FileName, &st) >= 0) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php