Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/goPublic

Commit5c196b8

Browse files
committed
[release-branch.go1.3] runtime: fix defer of nil func
««« CL 105140044 / c2832405e9b9runtime: fix defer of nil funcFixes#8047.LGTM=r, iantR=golang-codereviews, r, iantCC=dvyukov, golang-codereviews, khrhttps://golang.org/cl/105140044»»»LGTM=rR=golang-codereviews, rCC=adg, golang-codereviews, ianthttps://golang.org/cl/103370044
1 parentad02e9a commit5c196b8

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

‎src/pkg/runtime/stack.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,12 @@ runtime·newstack(void)
856856
void
857857
runtime·gostartcallfn(Gobuf*gobuf,FuncVal*fv)
858858
{
859-
runtime·gostartcall(gobuf,fv->fn,fv);
859+
void*fn;
860+
861+
fn=nil;
862+
if(fv!=nil)
863+
fn=fv->fn;
864+
runtime·gostartcall(gobuf,fn,fv);
860865
}
861866

862867
// Maybe shrink the stack being used by gp.

‎test/fixedbugs/issue8047b.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// run
2+
3+
// Copyright 2014 The Go Authors. All rights reserved.
4+
// Use of this source code is governed by a BSD-style
5+
// license that can be found in the LICENSE file.
6+
7+
// Issue 8047. Defer setup during panic shouldn't crash for nil defer.
8+
9+
package main
10+
11+
funcmain() {
12+
deferfunc() {
13+
recover()
14+
}()
15+
f()
16+
}
17+
18+
funcf() {
19+
vargfunc()
20+
deferg()
21+
panic(1)
22+
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp