One more fix to prevent buffer overruns. (#314081, Hans Breuer)

2005-08-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkhsv.c (paint_triangle): One more fix to prevent buffer
	overruns.  (#314081, Hans Breuer)

diff --git a/ChangeLog b/ChangeLog
index 2de02a50139a1544f323e642849fcbe47b70e4c4..caae3f0ca70c35245fd285008b86c97f594ba449 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkhsv.c (paint_triangle): One more fix to prevent buffer
+       overruns.  (#314081, Hans Breuer)
+
 2005-08-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_get_layout): Clarify that the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2de02a50139a1544f323e642849fcbe47b70e4c4..caae3f0ca70c35245fd285008b86c97f594ba449 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkhsv.c (paint_triangle): One more fix to prevent buffer
+       overruns.  (#314081, Hans Breuer)
+
 2005-08-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_get_layout): Clarify that the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2de02a50139a1544f323e642849fcbe47b70e4c4..caae3f0ca70c35245fd285008b86c97f594ba449 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-08-22  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkhsv.c (paint_triangle): One more fix to prevent buffer
+       overruns.  (#314081, Hans Breuer)
+
 2005-08-20  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkentry.c (gtk_entry_get_layout): Clarify that the

diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index fcd5d535783601ef75d715df60761d8b624583c4..2b690c0f0696a3340df16de15941835470dbdf2c 100644 (file)
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -1195,6 +1195,7 @@ paint_triangle (GtkHSV      *hsv,
 
        x_start = MAX (xl - PAD, x);
        x_end = MIN (xr + PAD, x + width);
+       x_start = MIN (x_start, x_end);
 
        c = (rl << 16) | (gl << 8) | bl;