parsing: handle EOF and queue syncing

Author: micvbang

parsing.go

@@ -70,6 +70,14 @@ func (p *Parser) ParseHeader() (common.DemoHeader, error) {
 // See also: ParseNextFrame() for other possible errors.
 func (p *Parser) ParseToEnd() (err error) {
 	defer func() {
+		// Make sure all the messages of the demo are handled
+		p.msgDispatcher.SyncAllQueues()
+
+		// Close msgQueue
+		if p.msgQueue != nil {
+			close(p.msgQueue)
+		}
+
 		if err == nil {
 			err = recoverFromUnexpectedEOF(recover())
 		}
@@ -89,12 +97,6 @@ func (p *Parser) ParseToEnd() (err error) {
 
 		default:
 			if !p.parseFrame() {
-				// Make sure all the messages of the demo are handled
-				p.msgDispatcher.SyncAllQueues()
-
-				// Close msgQueue
-				close(p.msgQueue)
-
 				return p.error()
 			}
 		}
@@ -107,7 +109,7 @@ func (p *Parser) ParseToEnd() (err error) {
 
 func recoverFromUnexpectedEOF(r interface{}) error {
 	if r != nil {
-		if r == io.ErrUnexpectedEOF {
+		if r == io.ErrUnexpectedEOF || r == io.EOF {
 			return ErrUnexpectedEndOfDemo
 		}
 		panic(r)