From: drh <drh@noemail.net>
Date: Mon, 11 Oct 2010 17:58:21 +0000 (+0000)
Subject: Make sure the sqlite3_create_collation() interfaces always return an error
X-Git-Tag: version-3.7.4~97
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=88404c2a7d073938f441f9a3e492e99a0fba2691;p=thirdparty%2Fsqlite.git

Make sure the sqlite3_create_collation() interfaces always return an error
code if they fail.  Ticket [a04e42a3fcacaffa3133436].

FossilOrigin-Name: 6464276ec1c0951a6edc59eb402ca3dd49629a18
---

diff --git a/manifest b/manifest
index 7f9a5d2e65..bf49d0c6db 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Further\schanges\sto\sextension\sloading\sto\ssupport\scompile-time\soptions.
-D 2010-10-11T17:57:42
+C Make\ssure\sthe\ssqlite3_create_collation()\sinterfaces\salways\sreturn\san\serror\ncode\sif\sthey\sfail.\s\sTicket\s[a04e42a3fcacaffa3133436].
+D 2010-10-11T17:58:21
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b01fdfcfecf8a0716c29867a67959f6148b79961
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -143,7 +143,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
 F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
 F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
 F src/loadext.c 8af9fcc75708d60b88636ccba38b4a7b3c155c3e
-F src/main.c da74b2269470d97a702d2956eeeb691a5e3a68c3
+F src/main.c 335d2c7ecb093db7b662d9325fe68fb9087a4814
 F src/malloc.c 3d7284cd9346ab6e3945535761e68c23c6cf40ef
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@ -876,14 +876,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 76c64a35567880b49af076df61c9fee76e934f14
-R 3693645cb9207011b4b4d6b807133849
+P f818fb6f73ada64eaf8785d9bb2d439b6d755461
+R 6e67c23791ac4b87ba355f665aa4f8b3
 U drh
-Z d4cde4cb275c9844545ecd2001936cd5
+Z e78b695b956c911c4c56255077d3b7a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMs1AZoxKgR168RlERAvsVAKCHm3J0cQI5m65yj8b1GYxq7aNSLwCgi232
-DSksswjs4QYnMLeBmk6G8Ok=
-=IMTj
+iD8DBQFMs1BAoxKgR168RlERAi+2AJ9B2TrYiXEg9jposxSmI8WCJkwy9wCeMwSq
+4L/h4oOhEJz4eDK7xfNp1DY=
+=Fla5
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 271ac3bc0c..632c0ba399 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f818fb6f73ada64eaf8785d9bb2d439b6d755461
\ No newline at end of file
+6464276ec1c0951a6edc59eb402ca3dd49629a18
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index 3b1ddaf9cc..25216070d6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1602,13 +1602,12 @@ static int createCollation(
   }
 
   pColl = sqlite3FindCollSeq(db, (u8)enc2, zName, 1);
-  if( pColl ){
-    pColl->xCmp = xCompare;
-    pColl->pUser = pCtx;
-    pColl->xDel = xDel;
-    pColl->enc = (u8)(enc2 | (enc & SQLITE_UTF16_ALIGNED));
-    pColl->type = collType;
-  }
+  if( pColl==0 ) return SQLITE_NOMEM;
+  pColl->xCmp = xCompare;
+  pColl->pUser = pCtx;
+  pColl->xDel = xDel;
+  pColl->enc = (u8)(enc2 | (enc & SQLITE_UTF16_ALIGNED));
+  pColl->type = collType;
   sqlite3Error(db, SQLITE_OK, 0);
   return SQLITE_OK;
 }