summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Russell <gabriel.russell@mongodb.com>2015-11-09 22:14:14 -0500
committerGabriel Russell <gabriel.russell@mongodb.com>2015-11-10 10:58:02 -0500
commitdfe8d61093cd529bce7bdd35b877fd6daad23bd9 (patch)
tree42554edc027bcbb8b1f294746788b5a501dbf7ca
parentb2e0d6ff82f7ed8f8cf990ef6b46cfde97473b94 (diff)
downloadmongo-dfe8d61093cd529bce7bdd35b877fd6daad23bd9.tar.gz
TOOLS-983 check Prelude.Read() error before using data
-rw-r--r--mongorestore/mongorestore.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/mongorestore/mongorestore.go b/mongorestore/mongorestore.go
index 4756e163448..d00783dc527 100644
--- a/mongorestore/mongorestore.go
+++ b/mongorestore/mongorestore.go
@@ -187,12 +187,12 @@ func (restore *MongoRestore) Restore() error {
Prelude: &archive.Prelude{},
}
err = restore.archive.Prelude.Read(restore.archive.In)
- log.Logf(log.DebugLow, `archive format version "%v"`, restore.archive.Prelude.Header.FormatVersion)
- log.Logf(log.DebugLow, `archive server version "%v"`, restore.archive.Prelude.Header.ServerVersion)
- log.Logf(log.DebugLow, `archive tool version "%v"`, restore.archive.Prelude.Header.ToolVersion)
if err != nil {
return err
}
+ log.Logf(log.DebugLow, `archive format version "%v"`, restore.archive.Prelude.Header.FormatVersion)
+ log.Logf(log.DebugLow, `archive server version "%v"`, restore.archive.Prelude.Header.ServerVersion)
+ log.Logf(log.DebugLow, `archive tool version "%v"`, restore.archive.Prelude.Header.ToolVersion)
target, err = restore.archive.Prelude.NewPreludeExplorer()
if err != nil {
return err