Changed SIZE_MAX references to values calculated at runtime.

This commit is contained in:
Markus Makela
2015-01-05 11:38:16 +02:00

View File

@ -286,7 +286,7 @@ modutil_get_query(GWBUF *buf)
case MYSQL_COM_QUERY: case MYSQL_COM_QUERY:
len = MYSQL_GET_PACKET_LEN(packet)-1; /*< distract 1 for packet type byte */ len = MYSQL_GET_PACKET_LEN(packet)-1; /*< distract 1 for packet type byte */
if (len < 1 || len > SIZE_MAX - 1 || (query_str = (char *)malloc(len+1)) == NULL) if (len < 1 || len > ~(size_t)0 - 1 || (query_str = (char *)malloc(len+1)) == NULL)
{ {
goto retblock; goto retblock;
} }
@ -296,7 +296,7 @@ modutil_get_query(GWBUF *buf)
default: default:
len = strlen(STRPACKETTYPE(packet_type))+1; len = strlen(STRPACKETTYPE(packet_type))+1;
if (len < 1 || len > SIZE_MAX - 1 || (query_str = (char *)malloc(len+1)) == NULL) if (len < 1 || len > ~(size_t)0 - 1 || (query_str = (char *)malloc(len+1)) == NULL)
{ {
goto retblock; goto retblock;
} }