From 27457fb9010f947c4d4071da10e7b635aaa763d1 Mon Sep 17 00:00:00 2001
From: Peter Verthez <Peter.Verthez@advalvas.be>
Date: Fri, 22 Nov 2002 21:31:23 +0000
Subject: [PATCH] More checking on validity of strings.

---
 gom/gom_modify.c | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/gom/gom_modify.c b/gom/gom_modify.c
index f628256..bff22cd 100644
--- 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"
 
@@ -45,14 +45,20 @@ char* gom_get_string_for_locale(char* data, int* conversion_failures)
 char* gom_set_string(char** data, const char* utf8_str)
 {
   char* result = NULL;
-  char* newptr = strdup(utf8_str);
-  
-  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;
@@ -60,5 +66,14 @@ char* gom_set_string(char** data, const char* utf8_str)
 
 char* gom_set_string_for_locale(char** data, const char* locale_str)
 {
-  return gom_set_string(data, convert_locale_to_utf8(locale_str));
+  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;
 }
-- 
2.30.2