From: Remi Gacogne Date: Fri, 22 Apr 2016 14:56:46 +0000 (+0200) Subject: Fix null pointer dereference on parsing error in ZoneParserTNG X-Git-Tag: rec-4.0.0-alpha3~36^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1239f65af457fab06dc81279f05422c82dd7210;p=thirdparty%2Fpdns.git Fix null pointer dereference on parsing error in ZoneParserTNG For example when parsing an unmatched '(' --- diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc index 1e8c3ccb4b..0de245dcc8 100644 --- a/pdns/zoneparser-tng.cc +++ b/pdns/zoneparser-tng.cc @@ -250,6 +250,9 @@ string ZoneParserTNG::getLineOfFile() if (d_zonedata.size() > 0) return "on line "+std::to_string(std::distance(d_zonedata.begin(), d_zonedataline))+" of given string"; + if (d_filestates.empty()) + return ""; + return "on line "+std::to_string(d_filestates.top().d_lineno)+" of file '"+d_filestates.top().d_filename+"'"; }