OSDN Git Service

[Qt][Draw][OpenGL] More fix against buffer overflow.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 14 Jun 2018 18:51:31 +0000 (03:51 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Thu, 14 Jun 2018 18:51:31 +0000 (03:51 +0900)
source/src/qt/gui/gl3/qt_glutil_gl3_0.cpp
source/src/qt/gui/gles2/qt_glutil_gles_2.cpp

index c4f140f..f587e04 100644 (file)
@@ -1478,6 +1478,9 @@ void GLDraw_3_0::do_set_texture_size(QImage *p, int w, int h)
 }
 void GLDraw_3_0::do_set_horiz_lines(int lines)
 {
+       if(lines > using_flags->get_real_screen_height()) {
+               lines = using_flags->get_real_screen_height();
+       }                       
        this->doSetGridsHorizonal(lines, false);
 }
 
index 4b0a2a7..4f0501a 100644 (file)
@@ -1385,6 +1385,9 @@ void GLDraw_ES_2::do_set_texture_size(QImage *p, int w, int h)
 }
 void GLDraw_ES_2::do_set_horiz_lines(int lines)
 {
+       if(lines > using_flags->get_real_screen_height()) {
+               lines = using_flags->get_real_screen_height();
+       }                       
        this->doSetGridsHorizonal(lines, false);
 }