Change 29959 by [EMAIL PROTECTED] on 2007/01/24 20:33:04

        Integrate:
        [ 27945]
        A couple of casts to PADOFFSET.
        2nd patch from :
        Subject: Re: [PATCH] cleanup 212 warnings emitted by gcc-4.2
        From: Marcus Holland-Moritz <[EMAIL PROTECTED]>
        Date: Sun, 23 Apr 2006 04:47:04 +0200
        Message-ID: <[EMAIL PROTECTED]>
        
        [ 27959]
        Coverity has started to notice another inconsistency in our NULL
        pointer checking.

Affected files ...

... //depot/maint-5.8/perl/op.c#174 integrate
... //depot/maint-5.8/perl/pad.c#62 integrate
... //depot/maint-5.8/perl/pp.c#124 integrate
... //depot/maint-5.8/perl/pp_ctl.c#154 integrate
... //depot/maint-5.8/perl/toke.c#143 integrate

Differences ...

==== //depot/maint-5.8/perl/pp_ctl.c#154 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c#153~29958~    2007-01-24 11:49:21.000000000 -0800
+++ perl/pp_ctl.c       2007-01-24 12:33:04.000000000 -0800
@@ -2905,7 +2905,7 @@
     DEBUG_x(dump_eval());
 
     /* Register with debugger: */
-    if (PERLDB_INTER && saveop->op_type == OP_REQUIRE) {
+    if (PERLDB_INTER && saveop && saveop->op_type == OP_REQUIRE) {
        CV * const cv = get_cv("DB::postponed", FALSE);
        if (cv) {
            dSP;

==== //depot/maint-5.8/perl/toke.c#143 (text) ====
Index: perl/toke.c
--- perl/toke.c#142~29958~      2007-01-24 11:49:21.000000000 -0800
+++ perl/toke.c 2007-01-24 12:33:04.000000000 -0800
@@ -5603,7 +5603,7 @@
 S_pending_ident(pTHX)
 {
     register char *d;
-    register I32 tmp = 0;
+    register PADOFFSET tmp = 0;
     /* pit holds the identifier we read and pending_ident is reset */
     char pit = PL_pending_ident;
     PL_pending_ident = 0;
@@ -9844,7 +9844,7 @@
           filehandle
        */
        if (*d == '$') {
-           I32 tmp;
+           PADOFFSET tmp;
 
            /* try to find it in the pad for this block, otherwise find
               add symbol table ops
End of Patch.

Reply via email to