From f189957991a1265ca85b14f7ea9d9b343fb91676 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sat, 31 May 2003 10:24:15 +0000 Subject: [PATCH] MFH: make use of safe_estrdup --- ext/exif/exif.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 0f3d183de7..fc2d4ca390 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3669,16 +3669,6 @@ 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 */ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_thumbnail, int read_all TSRMLS_DC) @@ -3702,12 +3692,12 @@ static int exif_read_file(image_info_type *ImageInfo, char *FileName, int read_t ImageInfo->read_all = read_all; ImageInfo->Thumbnail.filetype = IMAGE_FILETYPE_UNKNOWN; - 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)); + ImageInfo->encode_unicode = safe_estrdup(EXIF_G(encode_unicode)); + ImageInfo->decode_unicode_be = safe_estrdup(EXIF_G(decode_unicode_be)); + ImageInfo->decode_unicode_le = safe_estrdup(EXIF_G(decode_unicode_le)); + ImageInfo->encode_jis = safe_estrdup(EXIF_G(encode_jis)); + ImageInfo->decode_jis_be = safe_estrdup(EXIF_G(decode_jis_be)); + ImageInfo->decode_jis_le = safe_estrdup(EXIF_G(decode_jis_le)); if (php_stream_is(ImageInfo->infile, PHP_STREAM_IS_STDIO)) { if (VCWD_STAT(FileName, &st) >= 0) { -- 2.40.0