[Teem-commit] SF.net SVN: teem:[5984] teem/trunk/src/nrrd/apply1D.c

[<kin...@us...>]

Revision: 5984
          http://sourceforge.net/p/teem/code/5984
Author:   kindlmann
Date:     2013-07-27 05:21:32 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
see if this fixes -Warray-bounds warning

Modified Paths:
--------------
    teem/trunk/src/nrrd/apply1D.c

Modified: teem/trunk/src/nrrd/apply1D.c
===================================================================
--- teem/trunk/src/nrrd/apply1D.c	2013-07-27 05:15:34 UTC (rev 5983)
+++ teem/trunk/src/nrrd/apply1D.c	2013-07-27 05:21:32 UTC (rev 5984)
@@ -156,14 +156,20 @@
       copyMapAxis0 = (1 == mapAxis);
       /* need to make sure the relevant sizes match */
       for (ax=0; ax<nin->dim; ax++) {
-        if (nin->axis[ax].size != nmap->axis[mapAxis + 1 + ax].size) {
+        unsigned int taxi = mapAxis + 1 + ax;
+        if (taxi > NRRD_DIM_MAX-1) {
+          biffAddf(NRRD, "%s: test axis index %u exceeds NRRD_DIM_MAX-1 %u",
+                   me, taxi, NRRD_DIM_MAX-1);
+          return 1;
+        }
+        if (nin->axis[ax].size != nmap->axis[taxi].size) {
           char stmp1[AIR_STRLEN_SMALL], stmp2[AIR_STRLEN_SMALL];
           biffAddf(NRRD, "%s: input and mmap don't have compatible sizes: "
                    "nin->axis[%d].size (%s) "
                    "!= nmap->axis[%d].size (%s): ", me,
                    ax, airSprintSize_t(stmp1, nin->axis[ax].size),
                    mapAxis + 1 + ax,
-                   airSprintSize_t(stmp2, nmap->axis[mapAxis + 1 + ax].size));
+                   airSprintSize_t(stmp2, nmap->axis[taxi].size));
           return 1;
         }
       }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.