Made mnote_fuji_tag_get_description and

mnote_canon_tag_get_descripton more robust should any NULL
descriptions be added to the table (bug #3307219)

diff --git a/ChangeLog b/ChangeLog
index 62964f89cccc038797a9dd48214134d64cf0e6dd..6725b66ccc7a938cd99f79a3cac83ca1b0527484 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-07-11  Dan Fandrich <dan@coneharvesters.com>
+
+       * Made mnote_fuji_tag_get_description and
+         mnote_canon_tag_get_descripton more robust should any NULL
+         descriptions be added to the table (bug #3307219)
+
+2011-05-12  Dan Fandrich <dan@coneharvesters.com>
+
+       * Added more Canon lenses (from Adrian von Bidder and drochner)
+
 2011-02-16  Dan Fandrich <dan@coneharvesters.com>
 
        * Changed "knots" to more clear "nautical miles" (Ubuntu Launchpad bug

diff --git a/libexif/canon/mnote-canon-tag.c b/libexif/canon/mnote-canon-tag.c
index 6ef73a4e9ab841dc2b447fc3f8e9708ee68a2a04..3cacfa62399c93dd1e1b5f2aeebd2195d7012e1b 100644 (file)
--- a/libexif/canon/mnote-canon-tag.c
+++ b/libexif/canon/mnote-canon-tag.c
@@ -192,7 +192,7 @@ mnote_canon_tag_get_description (MnoteCanonTag t)
 
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
                if (table[i].tag == t) {
-                       if (!*table[i].description)
+                       if (!table[i].description || !*table[i].description)
                                return "";
                        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
                        return _(table[i].description);

diff --git a/libexif/fuji/mnote-fuji-tag.c b/libexif/fuji/mnote-fuji-tag.c
index 3200eb6cc7077e65f12cd37169d23640ac063692..3b80597150a6b76cc3d7c7cb3ded774fc5aceb55 100644 (file)
--- a/libexif/fuji/mnote-fuji-tag.c
+++ b/libexif/fuji/mnote-fuji-tag.c
@@ -96,7 +96,7 @@ mnote_fuji_tag_get_description (MnoteFujiTag t)
 
        for (i = 0; i < sizeof (table) / sizeof (table[0]); i++)
                if (table[i].tag == t) {
-                       if (!*table[i].description)
+                       if (!table[i].description || !*table[i].description)
                                return "";
                        bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
                        return _(table[i].description);