dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
bb4baf2
)
More checking on validity of strings.
author
Peter Verthez
<Peter.Verthez@advalvas.be>
Fri, 22 Nov 2002 21:31:23 +0000
(21:31 +0000)
committer
Peter Verthez
<Peter.Verthez@advalvas.be>
Fri, 22 Nov 2002 21:31:23 +0000
(21:31 +0000)
gom/gom_modify.c
patch
|
blob
|
history
diff --git
a/gom/gom_modify.c
b/gom/gom_modify.c
index f6282568f5ffcbb6db433278c941dd6c304e207d..bff22cd6de22d8fe1803ae36dbff588e8328a9bd 100644
(file)
--- a/
gom/gom_modify.c
+++ b/
gom/gom_modify.c
@@
-23,7
+23,7
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include "utf8
-locale
.h"
+#include "utf8.h"
#include "gom.h"
#include "gom_internal.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* 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 {
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;
}
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)
{
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;
}
}