From: pweilbacher <pweilbacher@noemail.net>
Date: Sun, 30 Dec 2007 23:38:00 +0000 (+0000)
Subject: fix case in os2GetTempname() where none of the usual environment variables are set... 
X-Git-Tag: version-3.6.10~1529
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a51576298beac554a118565986fcaa4354ffd4a;p=thirdparty%2Fsqlite.git

fix case in os2GetTempname() where none of the usual environment variables are set to not overwrite two unrelated bytes (CVS 4648)

FossilOrigin-Name: 9719a063942256e34395868d974ed2d53b81b697
---

diff --git a/manifest b/manifest
index 3b7fec7417..52ab6598c3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C simplify\sos2FullPathname()\sand\sat\sthe\ssame\stime\smake\sthe\sallocations\smore\srobust\s(CVS\s4647)
-D 2007-12-30T23:35:15
+C fix\scase\sin\sos2GetTempname()\swhere\snone\sof\sthe\susual\senvironment\svariables\sare\sset\sto\snot\soverwrite\stwo\sunrelated\sbytes\s(CVS\s4648)
+D 2007-12-30T23:38:01
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -116,7 +116,7 @@ F src/mutex_w32.c 6e197765f283815496193e78e9548b5d0e53b68e
 F src/os.c 8360932f1450b2b45edb608a3b184b031f7d00cc
 F src/os.h d04706d54a072c7a30ab9e346ad916ef28c842d5
 F src/os_common.h 98862f120ca6bf7a48ce8b16f158b77d00bc9d2f
-F src/os_os2.c 507e9271c732352a5f68f4a8eda207d6b0244012
+F src/os_os2.c 4aca68faa5fe20e41e1b123a46087ebd9e0bb170
 F src/os_os2.h c3f7d0af7e3453d1d7aa81b06c0a56f5a226530b
 F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
@@ -602,7 +602,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P a568a9cf3705f45c4734f212eb359cadd3b0c897
-R f11ffa6652f1bb12f593a4877bef97a3
+P 6f8952a8366065c9baa48cacc9c36743788210db
+R d03bd5237ba906118a2788f23f51b499
 U pweilbacher
-Z 7fb50af183722102715e160f20580cde
+Z 0ae878d989eb6f8e1b8537881b1062c2
diff --git a/manifest.uuid b/manifest.uuid
index 2e6a0dd4e5..cd55bac5c8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f8952a8366065c9baa48cacc9c36743788210db
\ No newline at end of file
+9719a063942256e34395868d974ed2d53b81b697
\ No newline at end of file
diff --git a/src/os_os2.c b/src/os_os2.c
index f188ad70f5..b3f6c69ea7 100644
--- a/src/os_os2.c
+++ b/src/os_os2.c
@@ -747,7 +747,8 @@ static int os2GetTempname( sqlite3_vfs *pVfs, int nBuf, char *zBuf ){
     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
     "0123456789";
   int i, j;
-  PSZ zTempPath = "";
+  char zTempPathBuf[3];
+  PSZ zTempPath = (PSZ)&zTempPathBuf;
   if( DosScanEnv( (PSZ)"TEMP", &zTempPath ) ){
     if( DosScanEnv( (PSZ)"TMP", &zTempPath ) ){
       if( DosScanEnv( (PSZ)"TMPDIR", &zTempPath ) ){