• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1Index: src/expr.c
2===================================================================
3--- src/expr.c	2009-09-08 12:16:11.000000000 -0700
4+++ src/expr.c	2009-09-23 16:58:47.000000000 -0700
5@@ -804,7 +804,9 @@
6       }else{
7         int nSize = exprStructSize(p);
8         memcpy(zAlloc, p, nSize);
9-        memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize);
10+        if( EXPR_FULLSIZE>nSize ){
11+          memset(&zAlloc[nSize], 0, EXPR_FULLSIZE-nSize);
12+        }
13       }
14
15       /* Set the EP_Reduced, EP_TokenOnly, and EP_Static flags appropriately. */
16Index: src/func.c
17===================================================================
18--- src/func.c	2009-09-04 13:37:42.000000000 -0700
19+++ src/func.c	2009-09-14 18:18:18.000000000 -0700
20@@ -1020,7 +1020,7 @@
21       }
22     }
23     if( zCharSet ){
24-      sqlite3_free(azChar);
25+      sqlite3_free((void*)azChar);
26     }
27   }
28   sqlite3_result_text(context, (char*)zIn, nIn, SQLITE_TRANSIENT);
29