Jacek Caban : jscript: Optimized concatenation of empty strings.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0e6d3b8611d2158c79448aa05063b6a8ac7de410
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0e6d3b8611d2158c79448aa05063b6a8ac7de410

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Dec 18 11:16:34 2012 +0100

jscript: Optimized concatenation of empty strings.

---

 dlls/jscript/jsstr.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c
index aad7af2..d34af0f 100644
--- a/dlls/jscript/jsstr.c
+++ b/dlls/jscript/jsstr.c
@@ -72,16 +72,19 @@ jsstr_t *jsstr_concat(jsstr_t *str1, jsstr_t *str2)
     jsstr_t *ret;
 
     len1 = jsstr_length(str1);
+    if(!len1)
+        return jsstr_addref(str2);
+
     len2 = jsstr_length(str2);
+    if(!len2)
+        return jsstr_addref(str1);
 
     ret = jsstr_alloc_buf(len1+len2);
     if(!ret)
         return NULL;
 
-    if(len1)
-        memcpy(ret->str, str1->str, len1*sizeof(WCHAR));
-    if(len2)
-        memcpy(ret->str+len1, str2->str, len2*sizeof(WCHAR));
+    memcpy(ret->str, str1->str, len1*sizeof(WCHAR));
+    memcpy(ret->str+len1, str2->str, len2*sizeof(WCHAR));
     return ret;
 }