X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=string.c;h=701448e041cfa9ff86dc1a6cccf37cd088b76c20;hp=c35285153fdadf031fafb544aea4affdf066a86d;hb=f23669d91a09066b7ecd7b07a74bea8fad61ad39;hpb=ad0a32acc373428d38e6b0f2f244ac3c31eea7c5 diff --git a/string.c b/string.c index c3528515..701448e0 100644 --- a/string.c +++ b/string.c @@ -633,7 +633,7 @@ int get_loglevel_by_name(const char *txt) return LL_CRIT; if (loglevel_equal(txt, "emerg")) return LL_EMERG; - return -1; + return -E_BAD_LL; } static int get_next_word(const char *buf, const char *delim, char **word) @@ -1073,7 +1073,7 @@ __must_check int strwidth(const char *s, size_t *result) return -ERRNO_TO_PARA_ERROR(errno); if (num_wchars == 0) return 0; - dest = para_malloc(num_wchars * sizeof(*dest)); + dest = para_malloc((num_wchars + 1) * sizeof(*dest)); src = s; memset(&state, 0, sizeof(state)); num_wchars = mbsrtowcs(dest, &src, num_wchars, &state);