Merge branch 'ob-10.0' into 10.0

storage/connect/odbconn.cpp

@@ -2360,9 +2360,11 @@ int ODBConn::GetCatInfo(CATPARM *cap)
         } // endif rc
 
       for (n = 0, crp = qrp->Colresp; crp; n++, crp = crp->Next) {
-        if (vlen[n] == SQL_NULL_DATA)
+				if (vlen[n] == SQL_NO_TOTAL)
+					ThrowDBX("Unexpected SQL_NO_TOTAL returned from SQLFetch");
+				else if (vlen[n] == SQL_NULL_DATA)
           pval[n]->SetNull(true);
-        else if (crp->Type == TYPE_STRING && vlen[n] != SQL_NULL_DATA)
+        else if (crp->Type == TYPE_STRING/* && vlen[n] != SQL_NULL_DATA*/)
           pval[n]->SetValue_char(pbuf[n], vlen[n]);
         else
           pval[n]->SetNull(false);

storage/connect/tabjson.cpp

@@ -755,7 +755,7 @@ int TDBJSN::MakeTopTree(PGLOBAL g, PJSON jsp)
     } else
       strcpy(To_Line, s);
 
-    Row->Clear();
+//  Row->Clear();
     return false;
   } else
     return true;
@@ -979,6 +979,7 @@ bool JSONCOL::ParseJpath(PGLOBAL g)
       if (!stricmp(Name, colp->GetName())) {
         Nod = colp->Nod;
         Nodes = colp->Nodes;
+				Xpd = colp->Xpd;
 				goto fin;
         } // endif Name
 
@@ -1347,6 +1348,11 @@ PJSON JSONCOL::GetRow(PGLOBAL g)
 /***********************************************************************/
 void JSONCOL::WriteColumn(PGLOBAL g)
   {
+	if (Xpd && Tjp->Pretty < 2) {
+		strcpy(g->Message, "Cannot write expanded column when Pretty is not 2");
+		longjmp(g->jumper[g->jump_level], 666);
+	  }	// endif Xpd
+
 	/*********************************************************************/
   /*  Check whether this node must be written.                         */
   /*********************************************************************/

storage/connect/value.cpp

@@ -103,6 +103,7 @@ ulonglong CharToNumber(char *p, int n, ulonglong maxval,
 
   if (minus) *minus = false;
   if (rc) *rc = false;
+	if (n <= 0) return 0LL;
 
   // Eliminate leading blanks or 0
   for (p2 = p + n; p < p2 && (*p == ' ' || *p == '0'); p++) ;
@@ -705,7 +706,7 @@ bool TYPVAL<TYPE>::SetValue_char(char *p, int n)
 template <>
 bool TYPVAL<double>::SetValue_char(char *p, int n)
   {
-  if (p) {
+  if (p && n > 0) {
     char buf[64];
 
     for (; n > 0 && *p == ' '; p++)
@@ -1345,7 +1346,7 @@ bool TYPVAL<PSZ>::SetValue_char(char *p, int n)
   {
   bool rc;
 
-  if (p) {
+  if (p && n > 0) {
     rc = n > Len;
 
     if ((n = MY_MIN(n, Len))) {
@@ -1804,7 +1805,7 @@ bool DECVAL::SetValue_char(char *p, int n)
   {
   bool rc;
 
-  if (p) {
+  if (p && n > 0) {
     rc = n > Len;
 
     if ((n = MY_MIN(n, Len))) {
@@ -2095,7 +2096,7 @@ bool BINVAL::SetValue_char(char *p, int n)
   {
   bool rc;
 
-  if (p) {
+  if (p && n > 0) {
     rc = n > Clen;
     Len = MY_MIN(n, Clen);
     memcpy(Binp, p, Len);
@@ -2672,13 +2673,16 @@ bool DTVAL::SetValue_char(char *p, int n)
     int   ndv;
     int  dval[6];
 
+		if (n > 0) {
 			// Trim trailing blanks
-    for (p2 = p + n -1; p < p2 && *p2 == ' '; p2--) ;
+			for (p2 = p + n -1; p < p2 && *p2 == ' '; p2--);
 
 			if ((rc = (n = p2 - p + 1) > Len))
 				n = Len;
 
 			memcpy(Sdate, p, n);
+			} // endif n
+
     Sdate[n] = '\0';
 
     ndv = ExtractDate(Sdate, Pdtp, DefYear, dval);