Changeset 71

Timestamp:

07/30/06 15:32:43 (18 years ago)

Author:

tim

Message:

added additional warnings for broken registry entries.

File:

• trunk/src/reglookup.c (modified) (5 diffs)

trunk/src/reglookup.c

@@ -219 +219 @@
       *error_msg = (char*)malloc(65+strlen(str_type)+strlen(tmp_err)+1);
       if(*error_msg == NULL)
+      {
+        free(ascii);
         return NULL;
+      }
       sprintf(*error_msg, "Unicode conversion failed on %s field; "
                "printing as binary.  Error: %s", str_type, tmp_err);
@@ -228 +231 @@
       cur_quoted = quote_string(ascii, common_special_chars);
     free(ascii);
+    if(cur_quoted == NULL)
+    {
+      *error_msg = (char*)malloc(27+1);
+      if(*error_msg != NULL)
+        strcpy(*error_msg, "Buffer could not be quoted.");
+    }
     return cur_quoted;
     break;
@@ -296 +305 @@
             *error_msg = (char*)malloc(90+strlen(tmp_err)+1);
             if(*error_msg == NULL)
+            {
+              free(cur_str);
+              free(cur_ascii);
+              free(ascii);
               return NULL;
+            }
             sprintf(*error_msg, "Unicode conversion failed on at least one "
                     "MULTI_SZ sub-field; printing as binary.  Error: %s",
@@ -346 +360 @@
     return quote_buffer(datap, len, common_special_chars);
     break;
-
-  default:
-    return NULL;
-    break;
-  } 
+  }
+
+
+  /* Invalid type */
+  *error_msg = (char*)malloc(33+11+1);
+  if(*error_msg != NULL)
+    sprintf(*error_msg, "Unrecognized registry data type: %d", type);
 
   return NULL;
@@ -498 +514 @@
   {
     if(conv_error == NULL)
-      fprintf(stderr, "ERROR: Could not quote value for '%s/%s'.  "
+      fprintf(stderr, "WARNING: Could not quote value for '%s/%s'.  "
               "Memory allocation failure likely.\n", prefix, quoted_name);
     else
-      fprintf(stderr, "ERROR: Could not quote value for '%s/%s'.  "
+      fprintf(stderr, "WARNING: Could not quote value for '%s/%s'.  "
               "Returned error: %s\n", prefix, quoted_name, conv_error);
   }