Removed a check to enforce each string value of an array to be of size less than maxSize to be consistent with scalar implementation. If an empty array is provided, report error and bail out.

Author: cjbj

src/njs/src/njsConnection.cpp

@@ -715,15 +715,22 @@ void Connection::GetBindUnit (Local<Value> val, Bind* bind,
      * For OUT bind, we can NOT determine the out value as ARRAY and so 
      * no validation done here.
      */
-    if ( dir == BIND_INOUT && element->IsArray () )
+    if ( element->IsArray () )
     {
       Local<Array>arr = Local<Array>::Cast (element);
 
-      if ( arr->Length() > bind->maxArraySize )
+      if ( dir == BIND_INOUT && ( arr->Length() > bind->maxArraySize ) )
       {
         executeBaton->error = NJSMessages::getErrorMsg ( errInvalidArraySize );
         goto exitGetBindUnit;
       }
+
+      /* For IN bind, empty array is not allowed */      
+      if ( ( dir == BIND_IN || dir == BIND_INOUT ) && ( arr->Length () == 0 ) )
+      {
+        executeBaton->error = NJSMessages::getErrorMsg ( errEmptyArray ) ;
+        goto exitGetBindUnit;
+      }
     }
 
     /* REFCURSOR(s) are supported only as OUT Binds now */
@@ -1128,15 +1135,6 @@ void Connection::GetInBindParamsArray(Local<Array> va8vals, Bind *bind,
           {
             arrayElementSize = stringLength;
           }
-
-          // Check if we have a string with a size larger then the specified
-          // maxSize (there is actually a default for maxSize if not specified)
-          if (stringLength > static_cast<size_t>(bind->maxSize))
-          {
-            executeBaton->error = NJSMessages::getErrorMsg(
-                                             errInvalidValueArrayBind);
-            goto exitGetInBindParamsArray;
-          }
         }
         break;
 

src/njs/src/njsMessages.cpp

@@ -76,8 +76,7 @@ static const char *errMsg[] =
   "NJS-036: given array is of size greater than maxArraySize",
   "NJS-037: incompatible type of value provided",
   "NJS-038: maxArraySize value should be greater than 0",
-  
-  
+  "NJS-039: empty array is not allowed for IN bind",
 };
 
 string NJSMessages::getErrorMsg ( NJSErrorType err, ... )

src/njs/src/njsMessages.h

@@ -72,6 +72,7 @@ typedef enum
   errInvalidArraySize,
   errIncompatibleTypeArrayBind,
   errInvalidValueArrayBind,
+  errEmptyArray,
 
 
   // New ones should be added here