From: pdr <pdr@noemail.net>
Date: Sat, 6 Feb 2016 14:14:43 +0000 (+0000)
Subject: Fix an assert() to have a test instead of a side effect
X-Git-Tag: version-3.11.0~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb3da060e3d90da84944b1d75df74ce7697d8998;p=thirdparty%2Fsqlite.git

Fix an assert() to have a test instead of a side effect

FossilOrigin-Name: a2952231ac7abe165ed070875728f752ae0be608
---

diff --git a/manifest b/manifest
index 15c459f19f..d6e074a0b5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\sand\sremove\sunreachable\sbranches\sfrom\sfts5\sin\sorder\sto\srestore\stest\scoverage.
-D 2016-02-05T21:09:26.310
+C Fix\san\sassert()\sto\shave\sa\stest\sinstead\sof\sa\sside\seffect
+D 2016-02-06T14:14:43.463
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@ -284,7 +284,7 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c e4a5132e6264e002ab87c268108f416df3f1fb10
+F src/alter.c d50b7dbb49a4affee951301afb76a008463e3625
 F src/analyze.c fbf0e80d83cc893734e872f932f249a056b86e11
 F src/attach.c c16c2648a577fa3def2adfa48c28901376389bc5
 F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
@@ -1426,7 +1426,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ca91bd8ac70a5b3fef127364f73ec675e58bb92c
-R bc449da6b3e9fd24816f80d5ebb5f8a2
-U dan
-Z 6b9788cdb90c1d425a4100a494ea3da5
+P 22589018ac3321f7bd89ce9fa69e57eae395e324
+R e3d82b169cbfebcfd4c4fb1447b3dcc4
+U pdr
+Z 6e44ca05901e086eb71b8481afaf44d8
diff --git a/manifest.uuid b/manifest.uuid
index 3643624eee..4f51f901e5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22589018ac3321f7bd89ce9fa69e57eae395e324
\ No newline at end of file
+a2952231ac7abe165ed070875728f752ae0be608
\ No newline at end of file
diff --git a/src/alter.c b/src/alter.c
index 3419059fa2..34ca8abd2c 100644
--- a/src/alter.c
+++ b/src/alter.c
@@ -695,7 +695,7 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
     rc = sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_BLOB, &pVal);
     assert( rc==SQLITE_OK || rc==SQLITE_NOMEM );
     if( rc!=SQLITE_OK ){
-      assert( db->mallocFailed = 1 );
+      assert( db->mallocFailed == 1 );
       return;
     }
     if( !pVal ){