Merge branch 'candidate-5.6.2' into candidate-6.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

system/jhtree/jhtree.cpp

@@ -594,8 +594,16 @@ public:
             {
                 keySize = ki->keySize();
                 keyedSize = ki->keyedSize();
-                assertex(keySize);
+                if (!keySize)
+                {
+                    StringBuffer err;
+                    err.appendf("Key appears corrupt - key file (%s) indicates record size is zero", keyName.get());
+                    IException *e = MakeStringExceptionDirect(1000, err.str());
+                    EXCLOG(e, err.str());
+                    throw e;
+                }
                 keyBuffer = (char *) malloc(keySize);
+
             }
             else
             {

system/jlib/jutil.cpp

@@ -2544,7 +2544,7 @@ const char * queryCurrentProcessPath()
                 char * biggerPath = new char[size]; 
                 if (_NSGetExecutablePath(biggerPath, &size) == 0)
                     processPath.set(biggerPath);
-                delete biggerPath;
+                delete [] biggerPath;
             }
             break;
         case 0: