postgres.git / summary / log / commit / refs

commit    65935033d64cb5ad51f7e5967860d545400beccd
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Thu Oct 20 03:32:08 2016 +0000

    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.


 src/timezone/zic.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index 22179e5b253..8c48ee9a6b6 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -432,9 +432,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));


[parent: fba888a8779e]