Follow-up to [e95439119ac200cb] to fix a case where a pointer is NULL due to

OOM.

FossilOrigin-Name: 2535bc8c256a7642a6ac00ebfd3393beb93da94394c13b886c3ddd20d114aa3c

diff --git a/manifest b/manifest
index 2a63a4cbbf34d80c4493c0e13e8097cebe7774e4..7512043e794f084f5ebe8e50bf824a0dc5606021 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sPRAGMA\sintegrity_check\sso\sthat\sit\scan\sdetect\swhen\sthere\sare\sextra\nbytes\sat\sthe\send\sof\san\sindex\srecord,\swhich\smight\scause\sOP_IdxRowid\sto\nmalfunction.\s\sdbsqlfuzz\sc1aa3986534d5feab8d21f28b3c1712df2ef358ba.\s\sTest\scase\nin\sTH3.
-D 2023-03-03T18:35:00.504
+C Follow-up\sto\s[e95439119ac200cb]\sto\sfix\sa\scase\swhere\sa\spointer\sis\sNULL\sdue\sto\nOOM.
+D 2023-03-03T19:43:39.157
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -565,7 +565,7 @@ F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca
 F src/btree.c c547e099f853de61835ff45da8d956a932d02ecf1ffd472a1f2a103b83e6dd40
 F src/btree.h aa354b9bad4120af71e214666b35132712b8f2ec11869cb2315c52c81fad45cc
 F src/btreeInt.h 06bb2c1a07172d5a1cd27a2a5d617b93b1e976c5873709c31964786f86365a6e
-F src/build.c f305be161a5609ece7b156f7ccebc92cc6a73915e8c2b4f33efdb07f79fcdae8
+F src/build.c 542a04532ae810a58366c47453de4fc1ca9fa6e6b2d920b6d639cdd1a1831309
 F src/callback.c 4cd7225b26a97f7de5fee5ae10464bed5a78f2adefe19534cc2095b3a8ca484a
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 20507cc0b0a6c19cd882fcd0eaeda32ae6a4229fb4b024cfdf3183043d9b703d
@@ -2048,8 +2048,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P cc4bb05b3653e9502b95ea6fe0bfb77feebc11285b66e1dde4c7b945928efbf1
-R e3264926b184a1150ff1e42cc58b6e34
+P f418bdd627e84e7d494f730d7124d8f4846ebcde031f5b2498685c9aceebb3c8
+R 58ecda2fbd94b7383314d0e1826c5d00
 U drh
-Z 4bf4a9f38f38c1a43669629bffba2cbf
+Z 97fb9baddea4583a0ed72a707ad43573
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d79799f154abf795350dd3f0b66b694d5cf8022f..8703c3c275e7fcf03c869347e1549150a8de1b2a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f418bdd627e84e7d494f730d7124d8f4846ebcde031f5b2498685c9aceebb3c8
\ No newline at end of file
+2535bc8c256a7642a6ac00ebfd3393beb93da94394c13b886c3ddd20d114aa3c
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 57762ebc2b4777c3ab868838a9c6956625ef7a02..c91e7bdd6a19d459a6631346cc3cc2e382bf0c0d 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -2012,7 +2012,7 @@ void sqlite3AddGenerated(Parse *pParse, Expr *pExpr, Token *pType){
     ** turn it into one by adding a unary "+" operator. */
     pExpr = sqlite3PExpr(pParse, TK_UPLUS, pExpr, 0);
   }
-  pExpr->affExpr = pCol->affinity;
+  if( pExpr ) pExpr->affExpr = pCol->affinity;
   sqlite3ColumnSetExpr(pParse, pTab, pCol, pExpr);
   pExpr = 0;
   goto generated_done;