Commit23ed2ba

committed

Another portability fix for tzcode2016g update.

clang points out that SIZE_MAX wouldn't fit into an int, which meansthis comparison is pretty useless. Per report from Thomas Munro.

1 parentad90ac4 commit23ed2baCopy full SHA for 23ed2ba

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -424,9 +424,8 @@ growalloc(void ptr, size_t itemsize, int nitems, int nitems_alloc)`
`424`	`424`	`else`
`425`	`425`	`{`
`426`	`426`	`intnitems_max=INT_MAX-WORK_AROUND_QTBUG_53071;`
`427`		`-intamax=nitems_max<SIZE_MAX ?nitems_max :SIZE_MAX;`
`428`	`427`
`429`		`-if ((amax-1) /32<nitems_alloc)`
	`428`	`+if ((nitems_max-1) /32<nitems_alloc)`
`430`	`429`	`memory_exhausted(_("int overflow"));`
`431`	`430`	`nitems_alloc=nitems_alloc+ (*nitems_alloc >>1)+1;`
`432`	`431`	`returnerealloc(ptr,size_product(*nitems_alloc,itemsize));`

Comments

(0)