MFH?
--Jani
On Fri, 30 May 2003, Marcus Boerger wrote:
>helly Fri May 30 14:59:49 2003 EDT
>
> Modified files:
> /php4/ext/exif exif.c
> Log:
> Use safe_estrdup() instead.
> # Thanks Sascha i didn't knew about that thing.
>
>
>Index: php4/ext/exif/exif.c
>diff -u php4/ext/exif/exif.c:1.147 php4/ext/exif/exif.c:1.148
>--- php4/ext/exif/exif.c:1.147 Fri May 30 13:46:57 2003
>+++ php4/ext/exif/exif.c Fri May 30 14:59:49 2003
>@@ -17,7 +17,7 @@
> +----------------------------------------------------------------------+
> */
>
>-/* $Id: exif.c,v 1.147 2003/05/30 17:46:57 helly Exp $ */
>+/* $Id: exif.c,v 1.148 2003/05/30 18:59:49 helly Exp $ */
>
> /* ToDos
> *
>@@ -99,7 +99,7 @@
> };
> /* }}} */
>
>-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.147 2003/05/30 17:46:57 helly Exp $"
>+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.148 2003/05/30 18:59:49 helly Exp $"
>
> /* {{{ PHP_MINFO_FUNCTION
> */
>@@ -3669,16 +3669,6 @@
> }
> /* }}} */
>
>-/* {{{ 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 @@
> 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) {
>
>
>
>
--
https://www.paypal.com/affil/pal=sniper%40php.net
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
