From: David du Colombier <0intro@gmail.com>
Date: Thu, 18 Sep 2014 21:25:11 +0000 (+0200)
Subject: runtime: fix handling of GOTRACEBACK
X-Git-Tag: go1.4beta1~359
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=45143aeca47da4595367e9ab0f1d0194f7847a96;p=gostls13.git

runtime: fix handling of GOTRACEBACK

Since CL 130990043, the GOTRACEBACK variable is
only used when the GODEBUG variable is set.
This change restores the original behavior.

LGTM=rsc
R=golang-codereviews, aram, gobot, r, rsc
CC=golang-codereviews
https://golang.org/cl/132520043
---

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index ae754dc5cd..aa8dd8f7a0 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -287,18 +287,18 @@ runtime·parsedebugvars(void)
 	intgo i, n;
 
 	p = runtime·getenv("GODEBUG");
-	if(p == nil)
-		return;
-	for(;;) {
-		for(i=0; i<nelem(dbgvar); i++) {
-			n = runtime·findnull((byte*)dbgvar[i].name);
-			if(runtime·mcmp(p, (byte*)dbgvar[i].name, n) == 0 && p[n] == '=')
-				*dbgvar[i].value = runtime·atoi(p+n+1);
+	if(p != nil){
+		for(;;) {
+			for(i=0; i<nelem(dbgvar); i++) {
+				n = runtime·findnull((byte*)dbgvar[i].name);
+				if(runtime·mcmp(p, (byte*)dbgvar[i].name, n) == 0 && p[n] == '=')
+					*dbgvar[i].value = runtime·atoi(p+n+1);
+			}
+			p = runtime·strstr(p, (byte*)",");
+			if(p == nil)
+				break;
+			p++;
 		}
-		p = runtime·strstr(p, (byte*)",");
-		if(p == nil)
-			break;
-		p++;
 	}
 
 	p = runtime·getenv("GOTRACEBACK");