From 0cb1ebddf15aabe9d31c55265938195da7382e12 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <icarus@martin-whitaker.me.uk>
Date: Wed, 24 Jul 2019 10:22:55 +0100
Subject: [PATCH] Fix for GitHub issue #239 - segfault when library file has
 syntax errors.

If there are errors when parsing a file, it is not safe to elaborate any
modules that have been found in that file.
---
 elaborate.cc   | 7 ++++++-
 load_module.cc | 8 +++++---
 util.h         | 2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/elaborate.cc b/elaborate.cc
index 588ccf11a..f944104dc 100644
--- a/elaborate.cc
+++ b/elaborate.cc
@@ -2233,7 +2233,8 @@ void PGModule::elaborate_scope(Design*des, NetScope*sc) const
 	// Not a module or primitive that I know about yet, so try to
 	// load a library module file (which parses some new Verilog
 	// code) and try again.
-      if (load_module(type_)) {
+      int parser_errors = 0;
+      if (load_module(type_, parser_errors)) {
 
 	      // Try again to find the module type
 	    mod = pform_modules.find(type_);
@@ -2248,6 +2249,10 @@ void PGModule::elaborate_scope(Design*des, NetScope*sc) const
 		  return;
       }
 
+      if (parser_errors) {
+            cerr << get_fileline() << ": error: Failed to parse library file." << endl;
+            des->errors += parser_errors + 1;
+      }
 
 	// Not a module or primitive that I know about or can find by
 	// any means, so give up.
diff --git a/load_module.cc b/load_module.cc
index b285302f2..b13f5491a 100644
--- a/load_module.cc
+++ b/load_module.cc
@@ -54,11 +54,13 @@ extern FILE *depend_file;
  * Use the type name as a key, and search the module library for a
  * file name that has that key.
  */
-bool load_module(const char*type)
+bool load_module(const char*type, int&parser_errors)
 {
       char path[4096];
       char*ltype = strdup(type);
 
+      parser_errors = 0;
+
       for (char*tmp = ltype ; *tmp ;  tmp += 1)
 	    *tmp = tolower(*tmp);
 
@@ -85,12 +87,12 @@ bool load_module(const char*type)
 	    if (verbose_flag)
 		  cerr << "Loading library file " << path << "." << endl;
 
-	    pform_parse(path);
+	    parser_errors = pform_parse(path);
 
 	    if (verbose_flag)
 		  cerr << "... Load module complete." << endl << flush;
 
-	    return true;
+	    return parser_errors == 0;
       }
 
       return false;
diff --git a/util.h b/util.h
index d94919af5..d0ebc90ea 100644
--- a/util.h
+++ b/util.h
@@ -34,7 +34,7 @@ class NetScope;
  * looking for a plausible Verilog file to hold the module, and
  * invoking the parser to bring in that file's contents.
  */
-extern bool load_module(const char*type);
+extern bool load_module(const char*type, int&parser_errors);