narray 0.6.0.0 → 0.6.0.1

data/src/ChangeLog

@@ -1,6 +1,11 @@
+2011-08-29  Masahiro TANAKA  <masa16.tanaka@gmail.com>
+
+	* narray.c (na_alloc_struct): check array size (zero/negative).
+	* ver 0.6.0.1
+
 2011-08-27  Masahiro TANAKA  <masa16.tanaka@gmail.com>
 
-	* narray.c (na_alloc_struct): check array size.
+	* narray.c (na_alloc_struct): check array size (overflow).
 	* extconf.rb (#install_rb): --export-all option for mingw.
 	* ver 0.6.0.0
 

data/src/narray.c

@@ -122,9 +122,15 @@ struct NARRAY*
   struct NARRAY *ary;
 
   for (i=0; i<rank; ++i) {
+    if (shape[i] < 0) {
+      rb_raise(rb_eArgError, "negative array size");
+    } else if (shape[i] == 0) {
+      total = 0;
+      break;
+    }
     total_bak = total;
-    total = total_bak * shape[i];
-    if (total>2147483647 || total/shape[i] != total_bak) {
+    total *= shape[i];
+    if (total < 1 || total > 2147483647 || total/shape[i] != total_bak) {
       rb_raise(rb_eArgError, "array size is too large");
     }
   }
@@ -141,7 +147,7 @@ struct NARRAY*
   else {
     memsz = na_sizeof[type] * total;
 
-    if (memsz>2147483647 || memsz/na_sizeof[type] != total) {
+    if (memsz < 1 || memsz > 2147483647 || memsz/na_sizeof[type] != total) {
       rb_raise(rb_eArgError, "allocation size is too large");
     }
 

data/src/narray.h

@@ -23,8 +23,8 @@
 # include <sys/types.h>
 #endif
 
-#define NARRAY_VERSION "0.6.0.0"
-#define NARRAY_VERSION_CODE 600
+#define NARRAY_VERSION "0.6.0.1"
+#define NARRAY_VERSION_CODE 601
 
 /*
   Data types used in NArray :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: narray
 version: !ruby/object:Gem::Version 
-  version: 0.6.0.0
+  version: 0.6.0.1
 platform: ruby
 authors: 
 - Masahiro Tanaka