aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-11-05 15:57:39 +0000
committerdrh <drh@noemail.net>2014-11-05 15:57:39 +0000
commit6b5631e02f2204da55742ec6e89b3633d36f51cb (patch)
tree34b89a258bba940ff770cc3078184f95df1b1594 /src
parent937994aa6596a0a77504f06d86d11f30bdc82fb3 (diff)
downloadsqlite-6b5631e02f2204da55742ec6e89b3633d36f51cb.tar.gz
sqlite-6b5631e02f2204da55742ec6e89b3633d36f51cb.zip
Make sure that NULL results from OP_Column are fully and completely NULL
and do not have the MEM_Ephem bit set. Fix for ticket [094d39a4c95ee4]. FossilOrigin-Name: 42705fd7d892c4fdfb95fbbb468c99569beece25
Diffstat (limited to 'src')
-rw-r--r--src/vdbe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vdbe.c b/src/vdbe.c
index 62470a743..bf9b233a2 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2301,7 +2301,7 @@ case OP_Column: {
pC->payloadSize = pC->szRow = avail = pReg->n;
pC->aRow = (u8*)pReg->z;
}else{
- MemSetTypeFlag(pDest, MEM_Null);
+ sqlite3VdbeMemSetNull(pDest);
goto op_column_out;
}
}else{