From: Robert Griesemer <gri@golang.org>
Date: Thu, 28 Mar 2013 15:46:17 +0000 (-0700)
Subject: cmd/godoc: don't crash if there's no documentation
X-Git-Tag: go1.1rc2~294
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1a427a697e9fce8bd3a12ae233bc6f751a406b9d;p=gostls13.git

cmd/godoc: don't crash if there's no documentation

Fixes regression introduced by CL 7860049.

R=golang-dev, kamil.kisiel, dave
CC=golang-dev
https://golang.org/cl/8069044
---

diff --git a/src/cmd/godoc/main.go b/src/cmd/godoc/main.go
index ab792c8af0..81e739d20c 100644
--- a/src/cmd/godoc/main.go
+++ b/src/cmd/godoc/main.go
@@ -388,12 +388,12 @@ func main() {
 	}
 
 	// determine what to use
-	if info.IsEmpty() {
-		if !cinfo.IsEmpty() {
+	if info == nil || info.IsEmpty() {
+		if cinfo != nil && !cinfo.IsEmpty() {
 			// only cinfo exists - switch to cinfo
 			info = cinfo
 		}
-	} else if !cinfo.IsEmpty() {
+	} else if cinfo != nil && !cinfo.IsEmpty() {
 		// both info and cinfo exist - use cinfo if info
 		// contains only subdirectory information
 		if info.PAst == nil && info.PDoc == nil {
@@ -403,9 +403,13 @@ func main() {
 		}
 	}
 
+	if info == nil {
+		log.Fatalf("%s: no such directory or package", flag.Arg(0))
+	}
 	if info.Err != nil {
 		log.Fatalf("%v", info.Err)
 	}
+
 	if info.PDoc != nil && info.PDoc.ImportPath == target {
 		// Replace virtual /target with actual argument from command line.
 		info.PDoc.ImportPath = flag.Arg(0)