Change 12212 by pudge@pudge-mobile on 2001/09/25 20:21:06
Integrate change #12200 from maintperl.
Affected files ...
... //depot/maint-5.6/macperl/win32/perlhost.h#4 integrate
Differences ...
==== //depot/maint-5.6/macperl/win32/perlhost.h#4 (text) ====
Index: perl/win32/perlhost.h
--- perl/win32/perlhost.h.~1~ Tue Sep 25 14:30:05 2001
+++ perl/win32/perlhost.h Tue Sep 25 14:30:05 2001
@@ -2252,11 +2252,12 @@
while(lpLocalEnv) {
// still have environment overrides to add
- // so copy the strings into place
- strcpy(lpStr, lpLocalEnv);
- nLength = strlen(lpLocalEnv) + 1;
- lpStr += nLength;
- lpEnvPtr += nLength;
+ // so copy the strings into place if not an override
+ char *ptr = strchr(lpLocalEnv, '=');
+ if(ptr && ptr[1]) {
+ strcpy(lpStr, lpLocalEnv);
+ lpStr += strlen(lpLocalEnv) + 1;
+ }
lpLocalEnv = GetIndex(dwEnvIndex);
}
End of Patch.
