ncurses 5.7 - patch 20090718

[ncurses.git] / ncurses / base / lib_slk.c

diff --git a/ncurses/base/lib_slk.c b/ncurses/base/lib_slk.c
index 127c2990560dd7f2789672c28ce1ba0ccd6a832f..a1dea62660ebd75ba2ea9cd87cf5363da3505821 100644 (file)
--- a/ncurses/base/lib_slk.c
+++ b/ncurses/base/lib_slk.c
@@ -47,7 +47,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_slk.c,v 1.39 2009/07/04 18:37:57 tom Exp $")
+MODULE_ID("$Id: lib_slk.c,v 1.40 2009/07/19 00:34:07 tom Exp $")
 
 /*
  * Free any memory related to soft labels, return an error.
@@ -67,11 +67,12 @@ NCURSES_EXPORT(int)
 _nc_format_slks(NCURSES_SP_DCLx int cols)
 {
     int gap, i, x;
-    unsigned max_length = SP_PARM->_slk->maxlen;
+    unsigned max_length;
 
-    if (!SP_PARM)
+    if (!SP_PARM || !SP_PARM->_slk)
        return ERR;
 
+    max_length = SP_PARM->_slk->maxlen;
     if (SP_PARM->slk_format >= 3) {    /* PC style */
        gap = (cols - 3 * (3 + 4 * max_length)) / 2;