From eca187e025409f508d2d51c0486802c0db998281 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Mon, 18 Jun 2018 10:24:29 +0100
Subject: [PATCH] dictionaryListEntryIO: Trap errors when reading entries in
 the list

Resolves bug-report https://bugs.openfoam.org/view.php?id=2984
---
 .../dictionaryListEntry/dictionaryListEntryIO.C | 17 ++++++++++++++---
 src/OpenFOAM/db/dictionary/entry/entryIO.C      |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C
index 7d31932e9..a93dce381 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryListEntry/dictionaryListEntryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2016-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,12 @@ Foam::dictionaryListEntry::dictionaryListEntry
 
         for (label i=0; i<s; i++)
         {
-            entry::New(*this, is);
+            if (!entry::New(*this, is))
+            {
+                FatalIOErrorInFunction(is)
+                    << "Failed to read dictionary entry in list"
+                    << exit(FatalIOError);
+            }
         }
         is.readEndList("List");
     }
@@ -88,7 +93,13 @@ Foam::dictionaryListEntry::dictionaryListEntry
                 break;
             }
             is.putBack(nextToken);
-            entry::New(*this, is);
+
+            if (!entry::New(*this, is))
+            {
+                FatalIOErrorInFunction(is)
+                    << "Failed to read dictionary entry in list"
+                    << exit(FatalIOError);
+            }
         }
     }
     else
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index 2a10aee4b..d9c8e8fad 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -139,7 +139,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
             // Otherwise the token is invalid
             cerr<< "--> FOAM Warning : " << std::endl
                 << "    From function "
-                << "entry::getKeyword(keyType&, Istream&)" << std::endl
+                << "entry::New(dictionary&, Istream&)" << std::endl
                 << "    in file " << __FILE__
                 << " at line " << __LINE__ << std::endl
                 << "    Reading " << is.name().c_str() << std::endl