summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJari Vetoniemi <mailroxas@gmail.com>2014-04-14 18:08:13 +0300
committerJari Vetoniemi <mailroxas@gmail.com>2014-04-14 18:08:13 +0300
commit0f34b70c90afb487541448ae88ca99d7186e8150 (patch)
tree834aaa0eb6d441099931153a28729cf62c147b60 /lib
parent850a8335d5c35cc81ba576cd4636460ea1684223 (diff)
downloadbemenu-0f34b70c90afb487541448ae88ca99d7186e8150.tar.gz
bemenu-0f34b70c90afb487541448ae88ca99d7186e8150.tar.bz2
bemenu-0f34b70c90afb487541448ae88ca99d7186e8150.zip
Move this check before allocation.
Diffstat (limited to 'lib')
-rw-r--r--lib/util.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/util.c b/lib/util.c
index fa85431..539afa2 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -254,6 +254,9 @@ size_t _bmUtf8RuneInsert(char **inOutString, size_t *inOutBufSize, size_t start,
if (outRuneWidth)
*outRuneWidth = 0;
+ if (u8len == 1 && !isprint(*rune))
+ return 0;
+
size_t len = (*inOutString ? strlen(*inOutString) : 0);
if (!*inOutString && !(*inOutString = calloc(1, (*inOutBufSize = u8len + 1))))
return 0;
@@ -273,9 +276,6 @@ size_t _bmUtf8RuneInsert(char **inOutString, size_t *inOutBufSize, size_t start,
*inOutBufSize *= 2;
}
- if (u8len == 1 && !isprint(*rune))
- return 0;
-
char *str = *inOutString + start;
memmove(str + u8len, str, len - start);
memcpy(str, rune, u8len);