2 files changed, 8 insertions, 7 deletions

diff --git a/src/plugins/nsfe_extractor.c b/src/plugins/nsfe_extractor.c
index 08c0509..ffd5ded 100644
--- a/src/plugins/nsfe_extractor.c
+++ b/src/plugins/nsfe_extractor.c
@@ -159,11 +159,10 @@ libextractor_nsfe_tlbl_extract(const char *data,
   for (left = size; left > 0; left -= length)
     {
       title = nsfestring (&data[size - left], left);
-      if (title != NULL)
-        {
-          length = strlen (title) + 1;
-          ADDF (title, EXTRACTOR_METATYPE_TITLE);
-        }
+      if (title == NULL)
+        return 0;       
+      length = strlen (title) + 1;
+      ADDF (title, EXTRACTOR_METATYPE_TITLE);
     }
   return 0;
 }
diff --git a/src/plugins/png_extractor.c b/src/plugins/png_extractor.c
index fbf25a0..7e35e8a 100644
--- a/src/plugins/png_extractor.c
+++ b/src/plugins/png_extractor.c
@@ -100,6 +100,8 @@ processtEXt (const char *data,
   if (off >= length)
     return 0;                /* failed to find '\0' */
   keyword = EXTRACTOR_common_convert_to_utf8 (&data[off], length - off, "ISO-8859-1");
+  if (keyword == NULL)
+    return 0;
   i = 0;
   ret = 0;
   while (tagmap[i].name != NULL)
@@ -249,8 +251,8 @@ processzTXt (const char *data,
   int i;
   char *buf;
   uLongf bufLen;
-  int ret;
   int zret;
+  int ret;
 
   data += 4;
   off = stnlen (data, length) + 1;
@@ -259,7 +261,7 @@ processzTXt (const char *data,
   if (data[off] != 0)
     return 0;                /* compression method must be 0 */
   off++;
-
+  ret = 0;
   bufLen = 1024 + 2 * (length - off);
   while (1)
     {