From ba0d5f9443c52b218414468c8b8b16d31864ad74 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Thu, 28 Apr 2016 19:03:17 -0500 Subject: [PATCH] Disallow single-quoted strings in Perl DBD parser --- src/tools/DBD/Base.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/tools/DBD/Base.pm b/src/tools/DBD/Base.pm index b0388d725..59b8e54bd 100644 --- a/src/tools/DBD/Base.pm +++ b/src/tools/DBD/Base.pm @@ -8,7 +8,7 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&pushContext &popContext &dieContext &warnContext &is_reserved &identifier &unquote &escapeCcomment &escapeCstring $RXident $RXname - $RXuint $RXint $RXhex $RXoct $RXuintx $RXintx $RXnum $RXdqs $RXsqs $RXstr); + $RXuint $RXint $RXhex $RXoct $RXuintx $RXintx $RXnum $RXdqs $RXstr); our $RXident = qr/ [a-zA-Z] [a-zA-Z0-9_]* /x; @@ -21,8 +21,7 @@ our $RXuintx = qr/ ( $RXhex | $RXoct | $RXuint ) /ox; our $RXintx = qr/ ( $RXhex | $RXoct | $RXint ) /ox; our $RXnum = qr/ -? (?: \d+ | \d* \. \d+ ) (?: [eE] [-+]? \d+ )? /x; our $RXdqs = qr/" (?: [^"] | \\" )* " /x; -our $RXsqs = qr/' (?: [^'] | \\' )* ' /x; -our $RXstr = qr/ ( $RXname | $RXnum | $RXdqs | $RXsqs ) /ox; +our $RXstr = qr/ ( $RXname | $RXnum | $RXdqs ) /ox; our @context;