numo-narray-alt 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2e2bc7cc99b7ef2b868b588360ff66299a6570b4d6ea98c45bbb357eed661b
-  data.tar.gz: '0887ab3061ad5add393ecd99921ca88e3a06545c9617ffc9686550cb87b3e843'
+  metadata.gz: 10e112d34dd103c74a42d19029a55e73ccbf12834f0a35028cb36361c22fce82
+  data.tar.gz: a72e185be47dea83dd226b9d681646fc66582a8af4e5467af66b100fcc8978b1
 SHA512:
-  metadata.gz: '09f47d21922f7e24e7915222eb9ddacadf4392156e53a15aee05d4f2fc6ebdafce244c3624de375b10411768d7f1a38de7d081504ef0fe21b6b1b82156ef9410'
-  data.tar.gz: 4cc3900b5631971fc76195eee5ecf66a6c1647a604d19997b0bcece1d1341f9245ace1c405c3f5e9dbc493389f456c4c9c817ea145a1c3a47f2180edea52ae36
+  metadata.gz: d7370426c2fd94fe941777358feda59993417d962c132308dce65a4d2187693e36166ab64b39e15751e0ae844defe37499d7d928f280ea4122ac7ae83d92f158
+  data.tar.gz: bc87a9588b7dc313338a7c209dcd15dda63e4dd76d7f1a76e4d65551c016e6d0027714bc959eb46cfb2374392ebaba03ffb33cc0e4619963378bd5d9975bfecf

data/ext/numo/narray/data.c

@@ -325,9 +325,17 @@ static void na_check_reshape(int argc, VALUE* argv, VALUE self, size_t* shape) {
   /* get shape from argument */
   for (i = 0; i < argc; ++i) {
     switch (TYPE(argv[i])) {
-    case T_FIXNUM:
-      total *= shape[i] = NUM2INT(argv[i]);
+    case T_FIXNUM: {
+      ssize_t x = NUM2SSIZET(argv[i]);
+      if (x < 0) {
+        rb_raise(rb_eArgError, "size must be non-negative");
+      }
+      if (x != 0 && total > SIZE_MAX / (size_t)x) {
+        rb_raise(rb_eArgError, "total size is too large");
+      }
+      total *= shape[i] = (size_t)x;
       break;
+    }
     case T_NIL:
     case T_TRUE:
       if (unfixed >= 0) {
@@ -341,6 +349,9 @@ static void na_check_reshape(int argc, VALUE* argv, VALUE self, size_t* shape) {
   }
 
   if (unfixed >= 0) {
+    if (total == 0) {
+      rb_raise(rb_eArgError, "cannot determine unfixed dimension when total size is zero");
+    }
     if (NA_SIZE(na) % total != 0) {
       rb_raise(rb_eArgError, "Total size size must be divisor");
     }

data/ext/numo/narray/index.c

@@ -126,7 +126,7 @@ static void na_parse_narray_index(VALUE a, int orig_dim, ssize_t size, na_index_
     GetNArray(idx, nidx);
     n = NA_SIZE(nidx);
     q->idx = ALLOC_N(size_t, n);
-    if (na->type != NARRAY_DATA_T) {
+    if (nidx->type != NARRAY_DATA_T) {
       rb_bug("NArray#where returned wrong type of NArray");
     }
     if (rb_obj_class(idx) == numo_cInt32) {
@@ -183,7 +183,13 @@ na_parse_range(VALUE range, ssize_t step, int orig_dim, ssize_t size, na_index_a
 
   rb_arithmetic_sequence_components_t x;
   rb_arithmetic_sequence_extract(range, &x);
+  if (!RB_INTEGER_TYPE_P(x.step)) {
+    rb_raise(rb_eArgError, "step must be an Integer");
+  }
   step = NUM2SSIZET(x.step);
+  if (step == 0) {
+    rb_raise(rb_eArgError, "step must not be zero");
+  }
 
   beg = beg_orig = NUM2SSIZET(x.begin);
   if (beg < 0) {
@@ -475,13 +481,17 @@ static void na_index_aref_nadata(
   na_get_strides_nadata(na1, strides_na1, elmsz);
 
   for (i = j = 0; i < ndim; i++) {
-    stride1 = strides_na1[q[i].orig_dim];
+    const int qi_orig_dim = q[i].orig_dim;
+    stride1 = 0;
+    if (qi_orig_dim < na1->base.ndim) {
+      stride1 = strides_na1[qi_orig_dim];
 
-    // numeric index -- trim dimension
-    if (!keep_dim && q[i].n == 1 && q[i].step == 0) {
-      beg = q[i].beg;
-      na2->offset += stride1 * beg;
-      continue;
+      // numeric index -- trim dimension
+      if (!keep_dim && q[i].n == 1 && q[i].step == 0) {
+        beg = q[i].beg;
+        na2->offset += stride1 * beg;
+        continue;
+      }
     }
 
     na2->base.shape[j] = size = q[i].n;
@@ -491,8 +501,11 @@ static void na_index_aref_nadata(
       na2->base.reduce = rb_funcall(m, '|', 1, na2->base.reduce);
     }
 
-    // array index
-    if (q[i].idx != NULL) {
+    if (qi_orig_dim >= na1->base.ndim) {
+      // new dimension
+      SDX_SET_STRIDE(na2->stridx[j], elmsz);
+    } else if (q[i].idx != NULL) {
+      // array index
       index = q[i].idx;
       SDX_SET_INDEX(na2->stridx[j], index);
       q[i].idx = NULL;

data/ext/numo/narray/narray.c

@@ -1322,6 +1322,7 @@ static VALUE nary_store_binary(int argc, VALUE* argv, VALUE self) {
   narray_t* na;
 
   narg = rb_scan_args(argc, argv, "11", &vstr, &voffset);
+  Check_Type(vstr, T_STRING);
   str_len = RSTRING_LEN(vstr);
   if (narg == 2) {
     offset = NUM2SIZET(voffset);

data/ext/numo/narray/numo/narray.h

@@ -13,10 +13,10 @@ extern "C" {
 #endif
 #endif
 
-#define NARRAY_VERSION "0.11.0"
+#define NARRAY_VERSION "0.11.1"
 #define NARRAY_VERSION_MAJOR 0
 #define NARRAY_VERSION_MINOR 11
-#define NARRAY_VERSION_PATCH 0
+#define NARRAY_VERSION_PATCH 1
 #define NARRAY_VERSION_CODE                                                                    \
   (NARRAY_VERSION_MAJOR * 10000 + NARRAY_VERSION_MINOR * 100 + NARRAY_VERSION_PATCH)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: numo-narray-alt
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - yoshoku
@@ -214,7 +214,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/yoshoku/numo-narray-alt
   changelog_uri: https://github.com/yoshoku/numo-narray-alt/blob/main/CHANGELOG.md
-  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.11.0/
+  documentation_uri: https://gemdocs.org/gems/numo-narray-alt/0.11.1/
   rubygems_mfa_required: 'true'
 post_install_message: |
   ===
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.13
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Numo::NArray Alternative is a project forked from Numo::NArray.
 test_files: []