summaryrefslogtreecommitdiffstats
path: root/src/widgets/sp-color-notebook.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2013-06-07 07:52:11 +0000
committerJon A. Cruz <jon@joncruz.org>2013-06-07 07:52:11 +0000
commitbfd18a3735059a4f308d540cd3d7d388ccb5d3ce (patch)
tree0872383e549acc71e4422c7e197d37dc131d63e4 /src/widgets/sp-color-notebook.cpp
parentGlibmm 2.32+ fix extended to optional components. Fixes bug #1179338. (diff)
downloadinkscape-bfd18a3735059a4f308d540cd3d7d388ccb5d3ce.tar.gz
inkscape-bfd18a3735059a4f308d540cd3d7d388ccb5d3ce.zip
Check for value in range before dereferencing.
(bzr r12357)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
-rw-r--r--src/widgets/sp-color-notebook.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index f75521e2c..c709e9775 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -651,8 +651,11 @@ void ColorNotebook::_updateRgbaEntry( const SPColor& color, gfloat alpha )
void ColorNotebook::_setCurrentPage(int i)
{
- gtk_notebook_set_current_page (GTK_NOTEBOOK (_book), i);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(_buttons[i]), TRUE);
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(_book), i);
+
+ if (_buttons && _trackerList && (static_cast<size_t>(i) < _trackerList->len) ) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(_buttons[i]), TRUE);
+ }
}
void ColorNotebook::_buttonClicked(GtkWidget *widget, SPColorNotebook *colorbook)