github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 19:47:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

parser: Fix simple quote setvar in the end of the line.

Browse Source 
Fix #1831
This commit is contained in:
Felipe Zimmerle
2018-09-11 15:30:09 -03:00
parent 738e328723
commit 764a2e43ff
8 changed files with 6520 additions and 6256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/parser/position.hh
View File

@@ -1,8 +1,8 @@
// A Bison parser, made by GNU Bison 3.0.4.
// A Bison parser, made by GNU Bison 3.0.5.
// Positions for Bison parsers in C++
// Copyright (C) 2002-2015 Free Software Foundation, Inc.
// Copyright (C) 2002-2015, 2018 Free Software Foundation, Inc.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -52,26 +52,25 @@
namespace yy {
#line 56 "position.hh" // location.cc:296
#line 56 "position.hh" // location.cc:292
/// Abstract a position.
class position
{
public:
/// Construct a position.
explicit position (std::string* f = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
: filename (f)
, line (l)
, column (c)
{
}
{}
/// Initialization.
void initialize (std::string* fn = YY_NULLPTR,
unsigned int l = 1u,
unsigned int c = 1u)
unsigned l = 1u,
unsigned c = 1u)
{
filename = fn;
line = l;
@@ -100,15 +99,15 @@ namespace yy {
/// File name to which this position refers.
std::string* filename;
/// Current line number.
unsigned int line;
unsigned line;
/// Current column number.
unsigned int column;
unsigned column;
private:
/// Compute max(min, lhs+rhs) (provided min <= lhs).
static unsigned int add_ (unsigned int lhs, int rhs, unsigned int min)
static unsigned add_ (unsigned lhs, int rhs, unsigned min)
{
return (0 < rhs || -static_cast<unsigned int>(rhs) < lhs
return (0 < rhs || -static_cast<unsigned>(rhs) < lhs
? rhs + lhs
: min);
}
@@ -176,5 +175,5 @@ namespace yy {
} // yy
#line 180 "position.hh" // location.cc:296
#line 179 "position.hh" // location.cc:292
#endif // !YY_YY_POSITION_HH_INCLUDED