Merge tag 'upstream/2.1.1'

Upstream version 2.1.1

Conflicts:
	.gitignore

1 files changed, 3 insertions, 3 deletions

diff --git a/src/test_multiplex.c b/src/test_multiplex.c
index a3b3e2f..23df347 100644
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@ -502,11 +502,11 @@ static int multiplexOpen(
 ){
   int rc = SQLITE_OK;                  /* Result code */
   multiplexConn *pMultiplexOpen;       /* The new multiplex file descriptor */
-  multiplexGroup *pGroup;              /* Corresponding multiplexGroup object */
+  multiplexGroup *pGroup = 0;          /* Corresponding multiplexGroup object */
   sqlite3_file *pSubOpen = 0;                    /* Real file descriptor */
   sqlite3_vfs *pOrigVfs = gMultiplex.pOrigVfs;   /* Real VFS */
-  int nName;
-  int sz;
+  int nName = 0;
+  int sz = 0;
   char *zToFree = 0;
 
   UNUSED_PARAMETER(pVfs);