fix 16 bit issues reported by valgrind

git-svn-id: svn://vcs.exim.org/pcre/code/branches/pcre16@822 2f5784b3-3f2a-0410-8824-cb99058d5e15

3 files changed, 10 insertions, 4 deletions

diff --git a/pcre_compile.c b/pcre_compile.c
index 3dfce13..031becb 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -7749,6 +7749,7 @@ cd->workspace_size = COMPILE_WORK_SIZE;
 cd->start_pattern = (const pcre_uchar *)pattern;
 cd->end_pattern = (const pcre_uchar *)(pattern + STRLEN_UC((const pcre_uchar *)pattern));
 cd->req_varyopt = 0;
+cd->assert_depth = 0;
 cd->external_options = options;
 cd->external_flags = 0;
 cd->open_caps = NULL;
diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c
index 5a37c6e..7f9df74 100644
--- a/pcre_jit_compile.c
+++ b/pcre_jit_compile.c
@@ -1497,7 +1497,7 @@ JUMPHERE(jump);
 
 static void skip_char_back(compiler_common *common)
 {
-/* Goes one character back. Only affects STR_PTR. Does not check begin. */
+/* Goes one character back. Affects STR_PTR and TMP1. Does not check begin. */
 DEFINE_COMPILER;
 #if defined SUPPORT_UTF && defined COMPILE_PCRE8
 struct sljit_label *label;
@@ -3403,19 +3403,20 @@ switch(type)
   length = GET(cc, 0);
   SLJIT_ASSERT(length > 0);
   OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0);
-  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
 #ifdef SUPPORT_UTF
   if (common->utf)
     {
+    OP1(SLJIT_MOV, TMP3, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
     OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, length);
     label = LABEL();
-    add_jump(compiler, fallbacks, CMP(SLJIT_C_LESS_EQUAL, STR_PTR, 0, TMP1, 0));
+    add_jump(compiler, fallbacks, CMP(SLJIT_C_LESS_EQUAL, STR_PTR, 0, TMP3, 0));
     skip_char_back(common);
     OP2(SLJIT_SUB | SLJIT_SET_E, TMP2, 0, TMP2, 0, SLJIT_IMM, 1);
     JUMPTO(SLJIT_C_NOT_ZERO, label);
     return cc + LINK_SIZE;
     }
 #endif
+  OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(TMP1), SLJIT_OFFSETOF(jit_arguments, begin));
   OP2(SLJIT_SUB, STR_PTR, 0, STR_PTR, 0, SLJIT_IMM, IN_UCHARS(length));
   add_jump(compiler, fallbacks, CMP(SLJIT_C_LESS, STR_PTR, 0, TMP1, 0));
   return cc + LINK_SIZE;
diff --git a/pcretest.c b/pcretest.c
index 46d18b1..398ea48 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -2855,7 +2855,7 @@ while (!done)
       int count, backrefmax, first_char, need_char, okpartial, jchanged,
         hascrorlf;
       int nameentrysize, namecount;
-      const pcre_uchar *nametable;
+      const pcre_uint8 *nametable;
 
       new_info(re, NULL, PCRE_INFO_SIZE, &size);
       new_info(re, NULL, PCRE_INFO_CAPTURECOUNT, &count);
@@ -2898,7 +2898,11 @@ while (!done)
           nametable += nameentrysize * (use_pcre16 ? 2 : 1);
 #else
           fprintf(outfile, "%3d\n", GET2(nametable, 0));
+#ifdef SUPPORT_PCRE8
           nametable += nameentrysize;
+#else
+          nametable += nameentrysize * 2;
+#endif
 #endif
           }
         }