[Pcre-svn] [1068] code/trunk/pcre_compile.c: pcre32: compile…

Kezdőlap
Üzenet törlése
Szerző: Subversion repository
Dátum:  
Címzett: pcre-svn
Tárgy: [Pcre-svn] [1068] code/trunk/pcre_compile.c: pcre32: compile: Fix signed/ unsigned mismatch in find_fixedlength
Revision: 1068
          http://vcs.pcre.org/viewvc?view=rev&revision=1068
Author:   chpe
Date:     2012-10-16 16:54:26 +0100 (Tue, 16 Oct 2012)


Log Message:
-----------
pcre32: compile: Fix signed/unsigned mismatch in find_fixedlength

Modified Paths:
--------------
    code/trunk/pcre_compile.c


Modified: code/trunk/pcre_compile.c
===================================================================
--- code/trunk/pcre_compile.c    2012-10-16 15:54:22 UTC (rev 1067)
+++ code/trunk/pcre_compile.c    2012-10-16 15:54:26 UTC (rev 1068)
@@ -1744,7 +1744,7 @@
   {
   int d;
   pcre_uchar *ce, *cs;
-  register int op = *cc;
+  register pcre_uchar op = *cc;


   switch (op)
     {
@@ -1864,7 +1864,7 @@
     case OP_EXACTI:
     case OP_NOTEXACT:
     case OP_NOTEXACTI:
-    branchlength += GET2(cc,1);
+    branchlength += (int)GET2(cc,1);
     cc += 2 + IMM2_SIZE;
 #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
     if (utf && HAS_EXTRALEN(cc[-1])) cc += GET_EXTRALEN(cc[-1]);
@@ -1932,7 +1932,7 @@
       case OP_CRRANGE:
       case OP_CRMINRANGE:
       if (GET2(cc,1) != GET2(cc,1+IMM2_SIZE)) return -1;
-      branchlength += GET2(cc,1);
+      branchlength += (int)GET2(cc,1);
       cc += 1 + 2 * IMM2_SIZE;
       break;