More checking on validity of strings.

[gedcom-parse.git] / gom / gom_modify.c

diff --git a/gom/gom_modify.c b/gom/gom_modify.c
index 95bd926b884b2fba50ab91de4ce459510381b65a..bff22cd6de22d8fe1803ae36dbff588e8328a9bd 100644 (file)
--- a/gom/gom_modify.c
+++ b/gom/gom_modify.c
@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "utf8-locale.h"
+#include "utf8.h"
 #include "gom.h"
 #include "gom_internal.h"
 
@@ -37,28 +37,43 @@ char* gom_get_string(char* data)
   return data;
 }
 
-char* gom_get_string_locale(char* data, int* conversion_failures)
+char* gom_get_string_for_locale(char* data, int* conversion_failures)
 {
   return convert_utf8_to_locale(gom_get_string(data), conversion_failures);
 }
 
-char* gom_set_string(char** data, const char* utf8_value)
+char* gom_set_string(char** data, const char* utf8_str)
 {
   char* result = NULL;
-  char* newptr = strdup(utf8_value);
-  
-  if (!newptr)
-    MEMORY_ERROR;
+  char* newptr;
+
+  if (!is_utf8_string(utf8_str)) {
+    gedcom_error(_("The input '%s' is not a valid UTF-8 string"), utf8_str);
+  }
   else {
-    if (*data) free(*data);
-    *data = newptr;
-    result = *data;
+    newptr = strdup(utf8_str);
+    if (!newptr)
+      MEMORY_ERROR;
+    else {
+      if (*data) free(*data);
+      *data = newptr;
+      result = *data;
+    }
   }
   
   return result;
 }
 
-char* gom_set_string_locale(char** data, const char* locale_value)
+char* gom_set_string_for_locale(char** data, const char* locale_str)
 {
-  return gom_set_string(data, convert_locale_to_utf8(locale_value));
+  char* result = NULL;
+  char* utf8_str = convert_locale_to_utf8(locale_str);
+  
+  if (!utf8_str)
+    gedcom_error(_("The input '%s' is not a valid string for the locale"),
+                locale_str);
+  else
+    result = gom_set_string(data, utf8_str);
+
+  return result;
 }