bugfix: make sure all variables are properly initialized

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 29c4fcb8914a92ae3e617fa420c17f21acb7b7ba..1cd4f9d5bbce74cdbe369deefc3bf7f93328b818 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.219 2014/03/30 21:28:01 schwarze Exp $ */
+/*     $Id: term.c,v 1.220 2014/04/05 21:18:19 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -630,6 +630,8 @@ term_setwidth(struct termp *p, const char *wstr)
        size_t           width;
        int              iop;
 
+       iop = 0;
+       width = 0;
        if (NULL != wstr) {
                switch (*wstr) {
                case ('+'):
@@ -641,15 +643,13 @@ term_setwidth(struct termp *p, const char *wstr)
                        wstr++;
                        break;
                default:
-                       iop = 0;
                        break;
                }
-               if ( ! a2roffsu(wstr, &su, SCALE_MAX)) {
-                       wstr = NULL;
+               if (a2roffsu(wstr, &su, SCALE_MAX))
+                       width = term_hspan(p, &su);
+               else
                        iop = 0;
-               }
        }
-       width = (NULL != wstr) ? term_hspan(p, &su) : 0;
        (*p->setwidth)(p, iop, width);
 }