svn commit: r346782 - in stable: 11/usr.bin/dtc 12/usr.bin/dtc

[Kyle Evans]

Author: kevans
Date: Sat Apr 27 04:16:15 2019
New Revision: 346782
URL: https://svnweb.freebsd.org/changeset/base/346782

Log:
  MFC r346469: dtc(1): Pull in fix for segfault-upon-error condition
  
  Specifically, parse errors within a node would lead to a segfault due to
  an unconditional dereference after emitting the error.

Modified:
  stable/12/usr.bin/dtc/fdt.cc
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/usr.bin/dtc/fdt.cc
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/usr.bin/dtc/fdt.cc
==============================================================================
--- stable/12/usr.bin/dtc/fdt.cc	Sat Apr 27 04:12:32 2019	(r346781)
+++ stable/12/usr.bin/dtc/fdt.cc	Sat Apr 27 04:16:15 2019	(r346782)
@@ -1622,7 +1622,10 @@ device_tree::parse_file(text_input_buffer &input,
 			}
 			input.next_token();
 			n = node::parse(input, *this, std::move(name), string_set(), string(), &defines);
-			n->name_is_path_reference = name_is_path_reference;
+			if (n)
+			{
+				n->name_is_path_reference = name_is_path_reference;
+			}
 		}
 		else
 		{