Changeset 1486 for trunk/bindings/java/org/nexusformat/NexusFile.java

Timestamp:

24/06/10 11:46:44 (2 years ago)

Author:

Tobias Richter

Message:

refs #221 add safety check for negative dims

File:

• trunk/bindings/java/org/nexusformat/NexusFile.java (modified) (6 diffs)

trunk/bindings/java/org/nexusformat/NexusFile.java

@@ -311 +311 @@
         if(handle < 0) throw new NexusException("NAPI-ERROR: File not open");
         checkType(type);    
-        checkForNull(name);
+        checkForNull(name, rank, iChunk);
+        checkForNegInIntArray(true, dim, iChunk);
         switch(compression_type) {
         case NexusFile.NX_COMP_NONE:
@@ -320 +321 @@
 
         }
-        nxmakecompdata(handle,name,type,rank,dim,compression_type, iChunk);
+        nxmakecompdata(handle, name, type, rank, dim, compression_type, iChunk);
     }
 
@@ -340 +341 @@
         if(handle < 0) throw new NexusException("NAPI-ERROR: File not open");
         checkType(type);
-        checkForNull(name);
-        nxmakedata(handle,name,type,rank,dim);
+        checkForNull(name, dim);
+        checkForNegInIntArray(true, dim);
+        nxmakedata(handle, name, type, rank, dim);
     }
     /**
@@ -442 +444 @@
         byte bdata[];
         if(handle < 0) throw new NexusException("NAPI-ERROR: File not open");
-        checkForNull(array);
+        checkForNull(start, size, array);
+        checkForNegInIntArray(false, start, size);
         try{
             HDFArray ha = new HDFArray(array);
@@ -529 +532 @@
 
        if(handle < 0) throw new NexusException("NAPI-ERROR: File not open");
-       checkForNull(array);
+       checkForNull(array, start, size);
+       checkForNegInIntArray(false, start,size);
        try{
            HDFArray ha =  new HDFArray(array);
@@ -741 +745 @@
     }
     
+    /**
+     * checks if any of the ints in the arrays are negative, 
+     * throws appropriate runtime exception if so
+     * for some being zero is stupid, but hopefully not fatal
+     */
+    private void checkForNegInIntArray(boolean allowUnlimited, int[]... args) {
+        boolean first=true;
+        for (int[] array : args)
+                for (int value: array) {
+                        if (value<0)
+                                if (value == this.NX_UNLIMITED && allowUnlimited && first) {
+                                        // all ok this time
+                                } else
+                                        throw new IllegalArgumentException("negative dimension received");
+                        first=false;
+                }
+    }
     /**
       * checkType verifies if a parameter is a valid NeXus type code.