Explorar o código

Merge pull request #11555 from ghalliday/issue20279

HPCC-20279 Fix roxie core if lockChild gets a blank response

Reviewed-by: Mark Kelly
Reviewed-by: Stuart Ort
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday %!s(int64=7) %!d(string=hai) anos
pai
achega
af9b36a4ee
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      roxie/ccd/ccdlistener.cpp

+ 1 - 1
roxie/ccd/ccdlistener.cpp

@@ -174,7 +174,7 @@ public:
         lockQuery.appendf("<control:childlock thisEndpoint='%d' parent='%d'/>", activeIdxes.item(idx), myEndpoint);
         doChildQuery(idx, lockQuery.str(), lockReply);
         Owned<IPropertyTree> lockResult = createPTreeFromXMLString(lockReply.str(), ipt_caseInsensitive|ipt_fast);
-        int lockCount = lockResult->getPropInt("Lock", 0);
+        int lockCount = lockResult ? lockResult->getPropInt("Lock", 0) : 0;
         if (lockCount)
         {
             return lockCount;