From: stephan <stephan@noemail.net>
Date: Wed, 2 Jul 2025 15:29:11 +0000 (+0000)
Subject: Correct mis-placed OOM checks in valueToTextV2().
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f82589bd893e183c9d14119326c6c9b662e32a08;p=thirdparty%2Fsqlite.git

Correct mis-placed OOM checks in valueToTextV2().

FossilOrigin-Name: 9226a2a3c60a0f11fec9dd66cfa89ad8e625e9f0507e8d66ba2a06caafd65a9c
---

diff --git a/manifest b/manifest
index d946f373dd..4db0b0ff25 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Per\s/chat\sand\sforum\sdiscussions:\s(A)\sRemove\sthe\svalue\stype\soutput\spointer\sfrom\stext/blob_v2().\s(B)\sTeach\sblob_v2()\sto\sreturn\san\sopaque\snon-NULL\spointer\sfor\slength-0\sblobs.
-D 2025-07-02T13:24:50.303
+C Correct\smis-placed\sOOM\schecks\sin\svalueToTextV2().
+D 2025-07-02T15:29:11.203
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -858,7 +858,7 @@ F src/vdbeInt.h 0bc581a9763be385e3af715e8c0a503ba8422c2b7074922faf4bb0d6ae31b15e
 F src/vdbeapi.c 8e147b96e11a72079788ac01080812fb272cdb10e58e2c123099ddda99f8b818
 F src/vdbeaux.c fd2c6b19a8892c31a2adc719f156f313560f9cc490cdbd04ff08fdae5d7aedb7
 F src/vdbeblob.c b1b4032cac46b41e44b957c4d00aee9851f862dfd85ecb68116ba49884b03dfd
-F src/vdbemem.c 9f35b9363563c9f1816e776bc5f5571785116e86d8320d62d2ecb6165b90199a
+F src/vdbemem.c 215049118fec969a3470eeedc631aa91ebbb8253e2ebbe3b1955be290276d387
 F src/vdbesort.c cb6f472e83ca12c46aa7de0ac0a9d11458b357986f2617a1c90dfb19a542ecbe
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c fc46b9cbd759dc013f0b3724549cc0d71379183c667df3a5988f7e2f1bd485f3
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a3ca0adbaf7da8d79341fa88919b11d49a040e5125c67962b93a98ea43f539c9
-R 7dd1e4528a9739c7b931a9c56ffcf3fd
+P c96539beb5ca3c6a467e5388b942767765a3f071e009c1767d3b4f1b0fb5da9c
+R f8d25a8ea053c38138b2625cb2d49cac
 U stephan
-Z 82614930fab8dbf419d006977ce34bbd
+Z a6cf5f2dc1a4f00f3ea3e7610985f250
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 43835e9a4f..bd7d9e678c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c96539beb5ca3c6a467e5388b942767765a3f071e009c1767d3b4f1b0fb5da9c
+9226a2a3c60a0f11fec9dd66cfa89ad8e625e9f0507e8d66ba2a06caafd65a9c
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 4a591faadb..6f7c4c0a34 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1394,11 +1394,16 @@ static SQLITE_NOINLINE int valueToTextV2(sqlite3_value* pVal, u8 enc,
         return SQLITE_NOMEM_BKPT;
       }
     }
-    sqlite3VdbeMemNulTerminate(pVal); /* IMP: R-31275-44060 */
+    if ( sqlite3VdbeMemNulTerminate(pVal) ){ /* IMP: R-31275-44060 */
+      return SQLITE_NOMEM_BKPT;
+    }
   }else{
     sqlite3VdbeMemStringify(pVal, enc, 0);
     assert( 0==(1&SQLITE_PTR_TO_INT(pVal->z)) );
   }
+  if( pVal->db && pVal->db->mallocFailed ){
+    return SQLITE_NOMEM_BKPT;
+  }
   assert(pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) || pVal->db==0
               || pVal->db->mallocFailed );
   if( pVal->enc==(enc & ~SQLITE_UTF16_ALIGNED) ){
@@ -1407,9 +1412,7 @@ static SQLITE_NOINLINE int valueToTextV2(sqlite3_value* pVal, u8 enc,
     *pnOut = pVal->n;
     return 0;
   }
-  return (pVal->db && pVal->db->mallocFailed)
-    ? SQLITE_NOMEM_BKPT
-    : SQLITE_ERROR;
+  return SQLITE_ERROR;
 }
 
 /* This function is only available internally, it is not part of the