Update of /cvsroot/libexif/exif/exif
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29114/exif
Modified Files:
exif-i18n.c exif-i18n.h
Log Message:
Fixed the NULL pointer dereference in a more efficient way.
Index: exif-i18n.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- exif-i18n.c 15 Aug 2005 20:43:19 -0000 1.5
+++ exif-i18n.c 25 Nov 2007 09:13:27 -0000 1.6
@@ -15,6 +15,9 @@
const char *
exif_i18n_convert_utf8_to_lat1 (const char *in)
{
+ if (!in)
+ return "";
+
#ifdef HAVE_ICONV
static iconv_t tr = 0;
size_t t = (in ? strlen (in) : 0);
Index: exif-i18n.h
===================================================================
RCS file: /cvsroot/libexif/exif/exif/exif-i18n.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -d -r1.2 -r1.3
--- exif-i18n.h 25 Nov 2007 05:58:00 -0000 1.2
+++ exif-i18n.h 25 Nov 2007 09:13:27 -0000 1.3
@@ -43,7 +43,7 @@
const char *exif_i18n_convert_utf8_to_lat1 (const char *);
-#define C(s) ((s) ? exif_i18n_convert_utf8_to_lat1(s) : "")
+#define C(s) (exif_i18n_convert_utf8_to_lat1(s))
#endif /* __I18N_H__ */
|
