Avoid a potential null-pointer dereference following an OOM.

FossilOrigin-Name: 25f6ed8de4df9c9890d4a352a6d11084433e82ea
This commit is contained in:
drh 2016-08-24 00:25:27 +00:00
parent e835bc1285
commit 894241c847
3 changed files with 8 additions and 7 deletions

View File

@ -1,5 +1,5 @@
C Simplify\sthe\srow\svalue\smisuse\serror\smessage.
D 2016-08-23T19:02:55.746
C Avoid\sa\spotential\snull-pointer\sdereference\sfollowing\san\sOOM.
D 2016-08-24T00:25:27.492
F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
F src/expr.c e67849c475435a2d8268a660aaeff7d1df505a2f
F src/expr.c be8772ac5019400096eea179c1bfd5acc420bde9
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@ -1520,7 +1520,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P e149e6b93a9afb3d574309c0db60e221e24078f7
R 4cb3db3c4cfd8c4158ffeb6116b28260
P 838c50a5bf46fd0340839d577fa28ba02b4f2034
R 960a362fd9424a163c5a4d069783cdea
U drh
Z 62ec580862aeb7b6a1de73caa33d9d9e
Z 2276dcfeffa9ab927fd9ef765fca4810

View File

@ -1 +1 @@
838c50a5bf46fd0340839d577fa28ba02b4f2034
25f6ed8de4df9c9890d4a352a6d11084433e82ea

View File

@ -2103,6 +2103,7 @@ int sqlite3FindInIndex(
int mustBeUnique; /* True if RHS must be unique */
Vdbe *v = sqlite3GetVdbe(pParse); /* Virtual machine being coded */
if( pParse->db->mallocFailed ) return IN_INDEX_NOOP;
assert( pX->op==TK_IN );
mustBeUnique = (inFlags & IN_INDEX_LOOP)!=0;