Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 12 Apr 2015 21:38:19 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r281473 - stable/10/cddl/contrib/opensolaris/lib/libdtrace/common
Message-ID:  <201504122138.t3CLcJhF029113@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Sun Apr 12 21:38:18 2015
New Revision: 281473
URL: https://svnweb.freebsd.org/changeset/base/281473

Log:
  MFC r280882:
  Fix a misparenthesization that could cause a crash if TERM is not set.

Modified:
  stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==============================================================================
--- stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Sun Apr 12 21:35:13 2015	(r281472)
+++ stable/10/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Sun Apr 12 21:38:18 2015	(r281473)
@@ -727,8 +727,8 @@ dt_print_packed(dtrace_hdl_t *dtp, FILE 
 			utf8 = B_TRUE;
 		} else if ((term = getenv("TERM")) != NULL &&
 		    (strcmp(term, "sun") == 0 ||
-		    strcmp(term, "sun-color") == 0) ||
-		    strcmp(term, "dumb") == 0) {
+		    strcmp(term, "sun-color") == 0 ||
+		    strcmp(term, "dumb") == 0)) {
 			utf8 = B_FALSE;
 		} else {
 			utf8 = B_TRUE;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504122138.t3CLcJhF029113>