- Typo (from 10.1) Modified: storage/connect/value.cpp

1 files changed, 38 insertions, 39 deletions

diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp
index c7a6c8dd06a..7af70ea1349 100644
--- a/storage/connect/value.cpp
+++ b/storage/connect/value.cpp
@@ -1659,46 +1659,45 @@ bool TYPVAL<PSZ>::Compute(PGLOBAL g, PVAL *vp, int np, OPVAL op)
 	if (trace)
 		htrc("Compute: np=%d op=%d\n", np, op);
 
-	for (i = 0; i < np; i++) {
-		p[i] = vp[i]->IsNull() ? NULL : vp[i]->GetCharString(val[i]);
-
-		if (trace)
-			htrc("p[%d]=%s\n", i, p[i]);
-
-	} // endfor i
-
-	if (p[0] && p[np - 1]) {
-		switch (op) {
-			case OP_CNC:
-				assert(np == 1 || np == 2);
-
-				if (np == 2)
-					SetValue_psz(p[0]);
-
-				if ((i = Len - (signed)strlen(Strp)) > 0)
-					strncat(Strp, p[np - 1], i);
-
-				if (trace)
-					htrc("Strp=%s\n", Strp);
-
-				break;
-			case OP_MIN:
-				assert(np == 2);
-				SetValue_psz((strcmp(p[0], p[1]) < 0) ? p[0] : p[1]);
-				break;
-			case OP_MAX:
-				assert(np == 2);
-				SetValue_psz((strcmp(p[0], p[1]) > 0) ? p[0] : p[1]);
-				break;
-			default:
-				//    sprintf(g->Message, MSG(BAD_EXP_OPER), op);
-				strcpy(g->Message, "Function not supported");
-				return true;
-		} // endswitch op
-
-		Null = false;
-	} // endif p[i]
+	for (i = 0; i < np; i++)
+		if (!vp[i]->IsNull()) {
+			p[i] = vp[i]->GetCharString(val[i]);
+
+			if (trace)
+				htrc("p[%d]=%s\n", i, p[i]);
+
+		} else
+			return false;
+
+	switch (op) {
+		case OP_CNC:
+			assert(np == 1 || np == 2);
+
+			if (np == 2)
+				SetValue_psz(p[0]);
+
+			if ((i = Len - (signed)strlen(Strp)) > 0)
+				strncat(Strp, p[np - 1], i);
+
+			if (trace)
+				htrc("Strp=%s\n", Strp);
+
+			break;
+		case OP_MIN:
+			assert(np == 2);
+			SetValue_psz((strcmp(p[0], p[1]) < 0) ? p[0] : p[1]);
+			break;
+		case OP_MAX:
+			assert(np == 2);
+			SetValue_psz((strcmp(p[0], p[1]) > 0) ? p[0] : p[1]);
+			break;
+		default:
+			//    sprintf(g->Message, MSG(BAD_EXP_OPER), op);
+			strcpy(g->Message, "Function not supported");
+			return true;
+	} // endswitch op
 
+	Null = false;
   return false;
   } // end of Compute