From 0e6d3b8611d2158c79448aa05063b6a8ac7de410 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 18 Dec 2012 11:16:34 +0100
Subject: [PATCH] jscript: Optimized concatenation of empty strings.

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

diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c
index aad7af29cc4..d34af0feae5 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;
 }