From 0384b1c6567d3f90975665ed4e7b3a09947cabee Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 20 Jan 2013 13:03:15 -0800 Subject: Replace strlen/malloc/memcpy set with strdup Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer --- xprop.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xprop.c b/xprop.c index 2dbacb5..9773ac3 100644 --- a/xprop.c +++ b/xprop.c @@ -985,7 +985,6 @@ Format_Len_Unicode (const char *string, int len) { char *data; const char *result, *error; - int len2; int validity = is_valid_utf8(string, len); @@ -1004,11 +1003,11 @@ Format_Len_Unicode (const char *string, int len) } result = Format_Len_String(string, len); - len2 = strlen(result); - data = malloc(len2+1); + /* result is stored in _formatting_buffer, so make a temporary + copy before we overwrite _formatting_buffer with error */ + data = strdup(result); if (!data) Fatal_Error("Out of memory!"); - memcpy(data, result, len2+1); memcpy(_formatting_buffer, error, strlen(error)+1); strcat(_formatting_buffer, data); -- cgit v1.2.3