瀏覽代碼

[util] Avoid compiler warning on gcc 4.6

Commit 196751c ("[build] Enable warnings when building utilities")
revealed a previously hidden compiler warning in util/nrv2b.c
regarding an out-of-bounds array subscript in the code

    #if defined(SWD_BEST_OFF)
        if (s->best_pos[2] == 0)
            s->best_pos[2] = key + 1;
    #endif

where best_pos[] is defined by

    #define SWD_BEST_OFF 1

    #if defined(SWD_BEST_OFF)
        unsigned int best_off[ SWD_BEST_OFF ];
        unsigned int best_pos[ SWD_BEST_OFF ];
    #endif

With SWD_BEST_OFF set to 1, it can be proven that all code paths
referring to s->best_off[] and s->best_pos[] will never be executed,
with the exception of the two lines above.  Since these two lines
alone can have no effect on execution, we can safely undefine
SWD_BEST_OFF.

Verified by comparing md5sums of bin/undionly.kpxe before and after
the change.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 12 年之前
父節點
當前提交
bc93e8ab41
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1
    1
      src/util/nrv2b.c

+ 1
- 1
src/util/nrv2b.c 查看文件

@@ -209,7 +209,7 @@ struct ucl_compress
209 209
 
210 210
 #define SWD_HSIZE	16384
211 211
 #define SWD_MAX_CHAIN	2048
212
-#define SWD_BEST_OFF    1
212
+#undef SWD_BEST_OFF
213 213
 
214 214
 #define HEAD3(b,p) \
215 215
     (((0x9f5f*(((((uint32_t)b[p]<<5)^b[p+1])<<5)^b[p+2]))>>5) & (SWD_HSIZE-1))

Loading…
取消
儲存