haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up dodgy array dimension 

Array is in pairs but has a single sentinel, trips up Coverity (CID 147346) and
does allow an out-of-bounds write if WX_GL_SAMPLES were ever removed from the
array.
This commit is contained in:
Chris Pavlina 2016-05-10 23:15:33 -04:00
parent ec67218b5a
commit 05255cbae8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
3d-viewer/common_ogl/cogl_att_list.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2015 Mario Luzeiro <mrluzeiro@ua.pt> * Copyright (C) 2015 Mario Luzeiro <mrluzeiro@ua.pt>
* Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2016 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -51,13 +51,12 @@ const int COGL_ATT_LIST::m_openGL_AttributesList[] = {
WX_GL_STENCIL_SIZE, 1, WX_GL_STENCIL_SIZE, 1,
WX_GL_SAMPLE_BUFFERS, 1, // Enable multisampling support (antialiasing). WX_GL_SAMPLE_BUFFERS, 1, // Enable multisampling support (antialiasing).
WX_GL_SAMPLES, 0, // Disable AA for the start. WX_GL_SAMPLES, 0, // Disable AA for the start.
0 // NULL termination 0, 0 // NULL termination
}; };
int COGL_ATT_LIST::m_openGL_AttributesList_toUse[ int COGL_ATT_LIST::m_openGL_AttributesList_toUse[
sizeof( COGL_ATT_LIST::m_openGL_AttributesList ) / DIM( COGL_ATT_LIST::m_openGL_AttributesList ) ] = { 0 };
sizeof( COGL_ATT_LIST::m_openGL_AttributesList[0] ) ] = { 0 };
const int *COGL_ATT_LIST::GetAttributesList( bool aUseAntiAliasing ) const int *COGL_ATT_LIST::GetAttributesList( bool aUseAntiAliasing )