Fix a potential memory leak following an OOM error in the pragma processing.

FossilOrigin-Name: 396ab8f87ea85a01f7cb73aa83d6572057ae97fc

diff --git a/manifest b/manifest
index 9f2f0544a071e58b98c8eef5e8fdf789cc7142de..3ef6b569f94f7ff91fec177414f924984d772cf7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\srecent\strunk\senhancements.
-D 2016-12-16T15:57:40.254
+C Fix\sa\spotential\smemory\sleak\sfollowing\san\sOOM\serror\sin\sthe\spragma\sprocessing.
+D 2016-12-16T21:02:17.940
 F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -381,7 +381,7 @@ F src/parse.y 5280d00e80f0fb118437ffc3ffc14c69ca0c87cd
 F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
-F src/pragma.c 6ca8fb0a4da012c4ec4e92c76d868dca97ac6a03
+F src/pragma.c 59cfc788ba5a678a45d6277a5cd719f0a32ee1db
 F src/pragma.h 74d46e32bdc7abb2d01710162ff96cfb483699b6
 F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1
@@ -1537,7 +1537,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dc006e08b80758b8ac3addd98a532b074b5ca132 053a149cc8244a7f85137129cfcb8622efe90306
-R 622e5a34bc63b8a2c15e428113c053e3
+P 74a0ca1f152d6d8454787557c6e990efe0e47a50
+R 143fd57a2118c35d1d22527b371c3d9a
 U drh
-Z 935fedef2d7541845766cdea56b5f368
+Z 45c8092d0c1b95e4209c22fb75d70bc1

diff --git a/manifest.uuid b/manifest.uuid
index babbdd40c0004b05de8ef153a40a1eac79a7ac0f..e2757ca94d9edf7fc404c91d4c8f710aa799da75 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-74a0ca1f152d6d8454787557c6e990efe0e47a50
\ No newline at end of file
+396ab8f87ea85a01f7cb73aa83d6572057ae97fc
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index e725b6cef0fef53add3dc23f35ce83c05f6350cf..ae1fde07a64b3c046569d30ae2dffb22e5820bee 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -321,7 +321,7 @@ void sqlite3Pragma(
   ** pragma, make sure it is open. 
   */
   if( iDb==1 && sqlite3OpenTempDatabase(pParse) ){
-    return;
+    goto pragma_out;
   }
 
   zLeft = sqlite3NameFromToken(db, pId);