From ea67d8b1bc102f48279c8a1f2815a6e3e13e5ccd Mon Sep 17 00:00:00 2001
From: Zhang Zhaolong <zhangzl2013@126.com>
Date: Fri, 13 Mar 2015 10:38:07 +0800
Subject: [PATCH] libwinpr: fix lost of mergeStrings.

Signed-off-by: Zhang Zhaolong <zhangzl2013@126.com>
---
 winpr/libwinpr/environment/environment.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/winpr/libwinpr/environment/environment.c b/winpr/libwinpr/environment/environment.c
index 6cafafc90..1720e57cd 100644
--- a/winpr/libwinpr/environment/environment.c
+++ b/winpr/libwinpr/environment/environment.c
@@ -350,6 +350,7 @@ LPCH MergeEnvironmentStrings(PCSTR original, PCSTR merge)
 				free(mergeStrings);
 				return NULL;
 			}
+			mergeStrings = new_str;
 		}
 
 		mergeStrings[mergeStringLength] = cp;