aboutsummaryrefslogtreecommitdiff
path: root/src/shell.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2014-01-16 04:37:13 +0000
committerdrh <drh@noemail.net>2014-01-16 04:37:13 +0000
commit7b19f252475ed3636e0d14d8843f33192b9c1a04 (patch)
treefe5ddc9bd52d3ae5e99499f2907c80c25cf77213 /src/shell.c
parent93c36bb399cee329b8bc0a10bff0af8b3d498f6e (diff)
parent7a429658d7e38e0ff52a9f0591a17fd9cb71929d (diff)
downloadsqlite-7b19f252475ed3636e0d14d8843f33192b9c1a04.tar.gz
sqlite-7b19f252475ed3636e0d14d8843f33192b9c1a04.zip
Merge trunk changes. Fix a possible NULL-pointer deference in WITH clause
name resolution. FossilOrigin-Name: 7f953b568baa3eede0b9c144be0b9bc86496341a
Diffstat (limited to 'src/shell.c')
-rw-r--r--src/shell.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shell.c b/src/shell.c
index 00cff6a8e..b5ce90208 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -597,6 +597,7 @@ static void output_c_string(FILE *out, const char *z){
*/
static void output_html_string(FILE *out, const char *z){
int i;
+ if( z==0 ) z = "";
while( *z ){
for(i=0; z[i]
&& z[i]!='<'