Date: Fri, 11 Oct 2013 20:07:04 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256330 - head/usr.sbin/bsdconfig/share Message-ID: <201310112007.r9BK74Pw082842@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Fri Oct 11 20:07:04 2013 New Revision: 256330 URL: http://svnweb.freebsd.org/changeset/base/256330 Log: Fix a bug that would occur in application death when debugging was enabled if you ended up in f_dialog_*_constrain() (indirectly, of course) with a purposefully-set NULL height, width, or rows parameter (because you didn't care to have that attribute calculated). Fix typo in a comment while here. Approved by: re (glebius) Modified: head/usr.sbin/bsdconfig/share/dialog.subr Modified: head/usr.sbin/bsdconfig/share/dialog.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/dialog.subr Fri Oct 11 19:43:37 2013 (r256329) +++ head/usr.sbin/bsdconfig/share/dialog.subr Fri Oct 11 20:07:04 2013 (r256330) @@ -415,8 +415,8 @@ f_dialog_size_constrain() if [ "$debug" ]; then # Print final constrained values to debugging - f_quietly f_getvar "$__var_height" - f_quietly f_getvar "$__var_width" + [ "$__var_height" ] && f_quietly f_getvar "$__var_height" + [ "$__var_width" ] && f_quietly f_getvar "$__var_width" fi return $__retval # success if no debug warnings were printed @@ -532,10 +532,10 @@ f_dialog_menu_constrain() fi if [ "$debug" ]; then - # Print final constrained values to debuggin - f_quietly f_getvar "$__var_height" - f_quietly f_getvar "$__var_width" - f_quietly f_getvar "$__var_rows" + # Print final constrained values to debugging + [ "$__var_height" ] && f_quietly f_getvar "$__var_height" + [ "$__var_width" ] && f_quietly f_getvar "$__var_width" + [ "$__var_rows" ] && f_quietly f_getvar "$__var_rows" fi return $__retval # success if no debug warnings were printed
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310112007.r9BK74Pw082842>