harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r572290 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src/main: PMF.cpp PMFAction.h
Date Mon, 03 Sep 2007 12:11:06 GMT
Author: varlax
Date: Mon Sep  3 05:11:05 2007
New Revision: 572290

URL: http://svn.apache.org/viewvc?rev=572290&view=rev
Log:
Applied HARMONY-4707 [drlvm][jit] possible crash in PMF logging

Modified:
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp
    harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMFAction.h

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp?rev=572290&r1=572289&r2=572290&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMF.cpp Mon Sep  3 05:11:05 2007
@@ -2590,7 +2590,7 @@
     if (currentCC != topLevelCC) {
         action = topLevelCC->getCurrentSessionAction();
     }
-    return (action!=NULL && action->step->logs == 0) ? LogStream::log_sink()
: action->step->logs->log(sid);
+    return (action == NULL || action->step->logs == NULL) ? LogStream::log_sink() :
action->step->logs->log(sid);
 }
 #endif
 

Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMFAction.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMFAction.h?rev=572290&r1=572289&r2=572290&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMFAction.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/main/PMFAction.h Mon Sep  3 05:11:05 2007
@@ -60,6 +60,8 @@
 {
 public:
 
+    IAction ()                                      : step(0) {}
+
     IActionFactory* getFactory () const             {return step->factory;}
     const char* getName () const                    {return step->factory->getName();}
     const char* getArg (const char* key) const      {return (step->args) ? step->args->get(key)
: 0;}



Mime
View raw message