From: dan <dan@noemail.net>
Date: Mon, 20 May 2019 19:46:30 +0000 (+0000)
Subject: Fix a segfault that could occur in sqlite3session_diff() if NULL were passed as the... 
X-Git-Tag: version-3.29.0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=595d9f5f3c19995b6ad1860c164b9aeb41b57000;p=thirdparty%2Fsqlite.git

Fix a segfault that could occur in sqlite3session_diff() if NULL were passed as the pzErrMsg argument.

FossilOrigin-Name: aee73fd28f031a2568ac723de0826be7f1dca6be3b049e4a04fb47af75dcf4bf
---

diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index 8d1cd77275..ecc7644d74 100644
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -1624,7 +1624,9 @@ int sqlite3session_diff(
       }
       sqlite3_free((char*)azCol);
       if( bMismatch ){
-        *pzErrMsg = sqlite3_mprintf("table schemas do not match");
+        if( pzErrMsg ){
+          *pzErrMsg = sqlite3_mprintf("table schemas do not match");
+        }
         rc = SQLITE_SCHEMA;
       }
       if( bHasPk==0 ){
diff --git a/manifest b/manifest
index 403dc74d11..c09a69ec05 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sautomatic\scompile-time\sselection\sof\sbyte-order,\sas\nsuggested\son\sthe\smailing\slist\sby\sSeb\sKemper.
-D 2019-05-20T18:43:57.348
+C Fix\sa\ssegfault\sthat\scould\soccur\sin\ssqlite3session_diff()\sif\sNULL\swere\spassed\sas\sthe\spzErrMsg\sargument.
+D 2019-05-20T19:46:30.673
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -435,7 +435,7 @@ F ext/session/sessioninvert.test ae1a003a9ab1f8d64227dbb5c3a4c97e65b561b01e7b295
 F ext/session/sessionrebase.test ccfa716b23bd1d3b03217ee58cfd90c78d4b99f53e6a9a2f05e82363b9142810
 F ext/session/sessionstat1.test 218d351cf9fcd6648f125a26b607b140310160184723c2666091b54450a68fb5
 F ext/session/sessionwor.test 67b5ab91d4f93ce65ff1f58240ac5ddf73f8670facc1ffa49cef56293d52818d
-F ext/session/sqlite3session.c 53a110fc7f421fe5570b8393d791fab9252e57194c68b8149d6af2145cbddbaf
+F ext/session/sqlite3session.c 3d9d3a414be386b87d83e642f4d93c8cbe83fe7b975d17b398f96caa1bfdc2cf
 F ext/session/sqlite3session.h 919be6649d39d6413ce7a63fc3e3bca3270e18bc2d57ad4040a70007b9e54397
 F ext/session/test_session.c 98797aba475a799376c9a42214f2d1debf2d0c3cb657d9c8bbf4f70bf3fb4aec
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
@@ -1827,7 +1827,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 3e1b55f3ab85710ed81574904718205c7370b5f0b5a41029e961486d2e3f37c7
-R a3c05b3b87a6165ad13eee712bf9c731
-U drh
-Z f54a9475480094a81a3f137c4c413f13
+P b7aad929619f7043b1685a6477d50f6b4436e85511eb365eceae3dd4dbab571a
+R f5e665aac91f707dd4c07ff4970b768b
+U dan
+Z da6735cf29da22434552d59a77aa93a6
diff --git a/manifest.uuid b/manifest.uuid
index 93a66399e0..3dfd7626aa 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b7aad929619f7043b1685a6477d50f6b4436e85511eb365eceae3dd4dbab571a
\ No newline at end of file
+aee73fd28f031a2568ac723de0826be7f1dca6be3b049e4a04fb47af75dcf4bf
\ No newline at end of file