Bug 736386 - [PATCH] Fix another potential null pointer dereference in src/util.cpp

bc95beac · Dimitri van Heesch · 24b5b715 · bc95beac
Commit bc95beac authored Sep 23, 2014 by Dimitri van Heesch
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.cpp src/util.cpp +1 -1

No files found.
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3669,7 +3669,7 @@ bool matchArguments2(Definition *srcScope,FileDef *srcFileScope,ArgumentList *sr
  // all arguments.
  ArgumentListIterator srcAli(*srcAl),dstAli(*dstAl);
  Argument *srcA,*dstA;
-  for (;(srcA=srcAli.current(),dstA=dstAli.current());++srcAli,++dstAli)
+  for (;(srcA=srcAli.current()) && (dstA=dstAli.current());++srcAli,++dstAli)
  { 
    if (!matchArgument2(srcScope,srcFileScope,srcA,
          dstScope,dstFileScope,dstA)