From: Niels Möller <nisse@lysator.liu.se>
Date: Tue, 16 Feb 2016 07:11:24 +0000 (+0100)
Subject: sexp-conv: Fail with an error message for unexpected ']' characters.
X-Git-Tag: nettle_3.3_release_20161001~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5606551f38a6e163b786a44d734bcd6e25c2d76c;p=thirdparty%2Fnettle.git

sexp-conv: Fail with an error message for unexpected ']' characters.
Fixes crash reported by Hanno Böck.
---

diff --git a/ChangeLog b/ChangeLog
index 8cb92085..8b430037 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-02-16  Niels Möller  <nisse@lysator.liu.se>
+
+	* tools/parse.c (sexp_parse): Fail with an error message for
+	unexpected ']' characters. Fixes crash reported by Hanno Böck.
+	Also handle SEXP_DISPLAY (internal error) explicitly, without a
+	default clause.
+
 2016-01-28  Niels Möller  <nisse@lysator.liu.se>
 
 	* Released nettle-3.2.
diff --git a/tools/parse.c b/tools/parse.c
index 008f3f14..388139ad 100644
--- a/tools/parse.c
+++ b/tools/parse.c
@@ -165,7 +165,10 @@ sexp_parse(struct sexp_parser *parser,
 	case SEXP_CODING_END:
 	  die("Unexpected end of transport encoding.\n");
 	  
-	default:
+	case SEXP_DISPLAY_END:
+	  die("Unexpected end of display tag.\n");
+
+	case SEXP_DISPLAY:
 	  /* Internal error. */
 	  abort();
 	}