diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-10-19 23:32:08 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-10-19 23:33:04 -0400 |
| commit | 4d6c7599b65b6bbd2357883662ea61beccddf81d (patch) | |
| tree | 1f680211266f2a8eee12f3db774419adbced1602 /src | |
| parent | c8321040c97f3e23f0b0d2c7e0dcd98de11cfd48 (diff) | |
Another portability fix for tzcode2016g update.
clang points out that SIZE_MAX wouldn't fit into an int, which means
this comparison is pretty useless. Per report from Thomas Munro.
Diffstat (limited to 'src')
| -rw-r--r-- | src/timezone/zic.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/timezone/zic.c b/src/timezone/zic.c index 82311e6bd00..4ff819931a7 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -436,9 +436,8 @@ growalloc(void *ptr, size_t itemsize, int nitems, int *nitems_alloc) else { int nitems_max = INT_MAX - WORK_AROUND_QTBUG_53071; - int amax = nitems_max < SIZE_MAX ? nitems_max : SIZE_MAX; - if ((amax - 1) / 3 * 2 < *nitems_alloc) + if ((nitems_max - 1) / 3 * 2 < *nitems_alloc) memory_exhausted(_("int overflow")); *nitems_alloc = *nitems_alloc + (*nitems_alloc >> 1) + 1; return erealloc(ptr, size_product(*nitems_alloc, itemsize)); |