diff options
| author | Joseph Herlant <herlantj@gmail.com> | 2018-04-27 12:44:13 -0700 |
|---|---|---|
| committer | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-04-30 10:48:01 -0700 |
| commit | 3e9bedc0257da58ac91dd9ff17f66901d090d511 (patch) | |
| tree | e357bf4a7a605fe7413970bddf55250b2f6f89d6 | |
| parent | 1f548872e2354deea375f6911294014ba40d307c (diff) | |
| download | navit-3e9bedc0257da58ac91dd9ff17f66901d090d511.tar.gz | |
Update:xmlconfig:Use g_strndup instead of strncpy
| -rw-r--r-- | navit/xmlconfig.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/navit/xmlconfig.c b/navit/xmlconfig.c index 1bb127373..615d1385d 100644 --- a/navit/xmlconfig.c +++ b/navit/xmlconfig.c @@ -784,9 +784,7 @@ strncmp_len(const char *s1, int s1len, const char *s2) { int ret; #if 0 - char c[s1len+1]; - strncpy(c, s1, s1len); - c[s1len]='\0'; + char *c = g_strndup(s1, s1len); dbg(lvl_debug,"'%s' vs '%s'", c, s2); #endif @@ -828,10 +826,7 @@ xpointer_test(const char *test, int len, struct xistate *elem) char c; const char *tmp[16]; #if 0 - char test2[len+1]; - - strncpy(test2, test, len); - test2[len]='\0'; + char *test2 = g_strndup(test, len); dbg(lvl_debug,"%s", test2); #endif if (!len) @@ -1019,11 +1014,9 @@ xi_text (xml_context *context, struct xmldocument *doc=user_data; struct xmlstate *curr, **state = doc->user_data; struct attr attr; - char *text_dup = g_malloc(text_len+1); curr=*state; - strncpy(text_dup, text, text_len); - text_dup[text_len]='\0'; + char *text_dup = g_strndup(text, text_len); attr.type=attr_xml_text; attr.u.str=text_dup; if (curr->object_func && curr->object_func->add_attr && curr->element_attr.u.data) |