diff options
| author | drh <drh@noemail.net> | 2008-12-06 16:46:13 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-12-06 16:46:13 +0000 |
| commit | bbce338412255f7aa5539c2bc6575f954d1ccae4 (patch) | |
| tree | 4c0d8674cfc417dbb48f1ea3ebc2e8284bac7bba /src | |
| parent | 2aca5846da68a40d9f1fddd74107ddd50ddf5173 (diff) | |
| download | sqlite-bbce338412255f7aa5539c2bc6575f954d1ccae4.tar.gz sqlite-bbce338412255f7aa5539c2bc6575f954d1ccae4.zip | |
Make sure a memory allocation error did not prevent UTF16 to UTF8 conversion
prior to doing a string comparison. (CVS 5988)
FossilOrigin-Name: 9d061e20d885bee7ac7875500a0e7c238b540a63
Diffstat (limited to 'src')
| -rw-r--r-- | src/vdbe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index bde57f587..ef6b922a3 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.791 2008/12/04 22:17:56 drh Exp $ +** $Id: vdbe.c,v 1.792 2008/12/06 16:46:14 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -1687,6 +1687,7 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ if( affinity ){ applyAffinity(pIn1, affinity, encoding); applyAffinity(pIn3, affinity, encoding); + if( db->mallocFailed ) goto no_mem; } assert( pOp->p4type==P4_COLLSEQ || pOp->p4.pColl==0 ); |