[Mesa-dev] [PATCH] mesa: add missing error check in _mesa_CallLists()

[Brian Paul]

On 02/08/2016 05:07 PM, Ian Romanick wrote:
> On 02/08/2016 02:31 PM, Brian Paul wrote:
>> Generate GL_INVALID_VALUE if n < 0.  Return early if n==0.
>> ---
>>   src/mesa/main/dlist.c | 9 +++++++++
>>   1 file changed, 9 insertions(+)
>>
>> diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
>> index cd8e3b6..24aea35 100644
>> --- a/src/mesa/main/dlist.c
>> +++ b/src/mesa/main/dlist.c
>> @@ -9105,6 +9105,15 @@ _mesa_CallLists(GLsizei n, GLenum type, const GLvoid * lists)
>>         return;
>>      }
>>
>> +   if (n < 0) {
>> +      _mesa_error(ctx, GL_INVALID_VALUE, "glCallLists(n < 0)");
>> +      return;
>> +   }
>> +   else if (n == 0) {
>
> I think the modern style is to put the 'else if' on the same line with
> the closing curly brace.  I'm not too picky about it since this matches
> all the rest of dlist.c.

I can change it before pushing.

>
> I'm also wondering... should this check go before the call to
> SAVE_FLUSH_VERTICES?  Usually we try to bail from errors before doing
> anything.

I don't see a call to SAVE_FLUSH_VERTICES() in _mesa_CallLists().  I 
think you're looking at save_CallLists().

R-b otherwise?

-Brian

>
>> +      /* nothing to do */
>> +      return;
>> +   }
>> +
>>      /* Save the CompileFlag status, turn it off, execute display list,
>>       * and restore the CompileFlag.
>>       */
>>
>