Fix an NULL deref in the randomblob() function following a malloc failure. (CVS 3940)

FossilOrigin-Name: 011e7db253f9a60c19977215eab1687930f15637

diff --git a/manifest b/manifest
index 919a206fdebfa5129834f63fd6b92ff5d2e8a122..3c9d5f30c965949e82278bd9f0ebbe1e629fedaa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\sversion\sof\sthe\sLIKE\soperator\sto\sthe\sicu\sextension.\sRequires\soptimisation.\s(CVS\s3939)
-D 2007-05-07T16:58:02
+C Fix\san\sNULL\sderef\sin\sthe\srandomblob()\sfunction\sfollowing\sa\smalloc\sfailure.\s(CVS\s3940)
+D 2007-05-07T19:31:16
 F Makefile.in ab0f3cb6b34aa8ccec0bb57e6696fd4bd6b34a8f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -71,7 +71,7 @@ F src/date.c c34a9c86ffd6da4cb3903ea038d977ec539d07e2
 F src/delete.c 5c0d89b3ef7d48fe1f5124bfe8341f982747fe29
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
 F src/expr.c 2f0f9f89efe9170e5e6ca5d5e93a9d5896fff5ac
-F src/func.c 9445a7e20cfc1a04aa5e8c982b36e39cef851ff9
+F src/func.c af70f33e3f68aec76c9357c3f128265eb86a3304
 F src/hash.c 67b23e14f0257b69a3e8aa663e4eeadc1a2b6fd5
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
 F src/insert.c e595ca26805dfb3a9ebaabc28e7947c479f3b14d
@@ -289,7 +289,7 @@ F test/malloc4.test 59cd02f71b363302a04c4e77b97c0a1572eaa210
 F test/malloc5.test f228cb7101ae403327824d327a1f5651d83ef0f2
 F test/malloc6.test 025ae0b78542e0ddd000d23f79d93e9be9ba0f15
 F test/malloc7.test 1cf52834509eac7ebeb92105dacd4669f9ca9869
-F test/malloc8.test c46bb15d03370a6740be49cb6cb5403ce711ff19
+F test/malloc8.test e4054ca2a87ab1d42255bec009b177ba20b5a487
 F test/malloc9.test 8381041fd89c31fba60c8a1a1c776bb022108572
 F test/manydb.test 8de36b8d33aab5ef295b11d9e95310aeded31af8
 F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
@@ -483,7 +483,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P ddc4e4797ff902692c4f0d86ec5f4e94cc7f0741
-R c3baf3c645e55d9b878c7a05ae7a30bb
-U danielk1977
-Z a53ea51c5cda49495951728b7ccf7458
+P 3e96105c1f084a4ab4dad4de6f4759e43fc497f7
+R 4b470de41a52b7c4c5d55622dfae106c
+U drh
+Z e869803811f5c9e61a3f370a5ec07ccf

diff --git a/manifest.uuid b/manifest.uuid
index 9079546f3c4bdf7fa441e0ae643465b17299d532..0753b9741b5232ad08dde289846ff15756758070 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3e96105c1f084a4ab4dad4de6f4759e43fc497f7
\ No newline at end of file
+011e7db253f9a60c19977215eab1687930f15637
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index 5e4b418d5557027cb424868d93a9ccc7f0cfb084..2403b3d566a928e14a840f74b9f5a68f3bc2040b 100644 (file)
--- a/src/func.c
+++ b/src/func.c
@@ -16,7 +16,7 @@
 ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
 ** All other code has file scope.
 **
-** $Id: func.c,v 1.145 2007/05/04 13:15:56 drh Exp $
+** $Id: func.c,v 1.146 2007/05/07 19:31:16 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -297,9 +297,11 @@ static void randomBlob(
   assert( argc==1 );
   n = sqlite3_value_int(argv[0]);
   if( n<1 ) n = 1;
-  p = sqlite3_malloc(n);
-  sqlite3Randomness(n, p);
-  sqlite3_result_blob(context, (char*)p, n, sqlite3_free);
+  p = sqliteMalloc(n);
+  if( p ){
+    sqlite3Randomness(n, p);
+    sqlite3_result_blob(context, (char*)p, n, sqlite3FreeX);
+  }
 }
 
 /*

diff --git a/test/malloc8.test b/test/malloc8.test
index 071861942ce635d81f771bb945cb9258fabbb7b7..e493647c64ad8856a4b584fef02bd9c1f771f8f2 100644 (file)
--- a/test/malloc8.test
+++ b/test/malloc8.test
@@ -11,7 +11,7 @@
 # This file contains additional out-of-memory checks (see malloc.tcl)
 # added to expose a bug in out-of-memory handling for sqlite3_value_text()
 #
-# $Id: malloc8.test,v 1.2 2007/04/30 21:39:16 drh Exp $
+# $Id: malloc8.test,v 1.3 2007/05/07 19:31:17 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -147,6 +147,9 @@ do_malloc_test 4 -sqlbody {
 do_malloc_test 5 -sqlbody {
   SELECT 1 FROM t1 WHERE a LIKE 'hello' ESCAPE NULL;
 }
+do_malloc_test 6 -sqlbody {
+  SELECT hex(randomblob(100));
+}
 
 # Ensure that no file descriptors were leaked.
 do_test malloc-99.X {