GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Fix #16057 Don't allow numbers with letters · phpmyadmin/sql-parser@baf83b4

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- Lexer.php
tests/Utils
- QueryTest.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/Lexer.php‎`

Copy file name to clipboardExpand all lines: src/Lexer.php

+13Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -756,6 +756,7 @@ public function parseNumber()`
`756`	`756`	`//`
`757`	`757`	`// Valid final states are: 2, 3, 4 and 6. Any parsing that finished in a`
`758`	`758`	`// state other than these is invalid.`
	`759`	`+ // Also, negative states are invalid states.`
`759`	`760`	`$iBak = $this->last;`
`760`	`761`	`$token = '';`
`761`	`762`	`$flags = 0;`
`@@ -798,6 +799,10 @@ public function parseNumber()`
`798`	`799`	`$state = 4;`
`799`	`800`	`} elseif ($this->str[$this->last] === 'e' \|\| $this->str[$this->last] === 'E') {`
`800`	`801`	`$state = 5;`
	`802`	`+ } elseif (($this->str[$this->last] >= 'a' && $this->str[$this->last] <= 'z')`
	`803`	`+ \|\| ($this->str[$this->last] >= 'A' && $this->str[$this->last] <= 'Z')) {`
	`804`	`+ // A number can't be directly followed by a letter`
	`805`	`+ $state = -$state;`
`801`	`806`	`} elseif ($this->str[$this->last] < '0' \|\| $this->str[$this->last] > '9') {`
`802`	`807`	// Just digits and `.`, `e` and `E` are valid characters.
`803`	`808`	`break;`
`@@ -806,6 +811,10 @@ public function parseNumber()`
`806`	`811`	`$flags \|= Token::FLAG_NUMBER_FLOAT;`
`807`	`812`	`if ($this->str[$this->last] === 'e' \|\| $this->str[$this->last] === 'E') {`
`808`	`813`	`$state = 5;`
	`814`	`+ } elseif (($this->str[$this->last] >= 'a' && $this->str[$this->last] <= 'z')`
	`815`	`+ \|\| ($this->str[$this->last] >= 'A' && $this->str[$this->last] <= 'Z')) {`
	`816`	`+ // A number can't be directly followed by a letter`
	`817`	`+ $state = -$state;`
`809`	`818`	`} elseif ($this->str[$this->last] < '0' \|\| $this->str[$this->last] > '9') {`
`810`	`819`	// Just digits, `e` and `E` are valid characters.
`811`	`820`	`break;`
`@@ -816,6 +825,10 @@ public function parseNumber()`
`816`	`825`	`\|\| ($this->str[$this->last] >= '0' && $this->str[$this->last] <= '9')`
`817`	`826`	`) {`
`818`	`827`	`$state = 6;`
	`828`	`+ } elseif (($this->str[$this->last] >= 'a' && $this->str[$this->last] <= 'z')`
	`829`	`+ \|\| ($this->str[$this->last] >= 'A' && $this->str[$this->last] <= 'Z')) {`
	`830`	`+ // A number can't be directly followed by a letter`
	`831`	`+ $state = -$state;`
`819`	`832`	`} else {`
`820`	`833`	`break;`
`821`	`834`	`}`

Collapse file

`‎tests/Utils/QueryTest.php‎`

Copy file name to clipboardExpand all lines: tests/Utils/QueryTest.php

+12Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -416,14 +416,26 @@ public function getTablesProvider()`
`416`	`416`	'INSERT INTO tbl(`id`, `name`) VALUES (1, "Name")',
`417`	`417`	array('`tbl`')
`418`	`418`	`),`
	`419`	`+ array(`
	`420`	+ 'INSERT INTO 0tbl(`id`, `name`) VALUES (1, "Name")',
	`421`	+ array('`0tbl`')
	`422`	`+ ),`
`419`	`423`	`array(`
`420`	`424`	`'UPDATE tbl SET id = 0',`
`421`	`425`	array('`tbl`')
`422`	`426`	`),`
	`427`	`+ array(`
	`428`	`+ 'UPDATE 0tbl SET id = 0',`
	`429`	+ array('`0tbl`')
	`430`	`+ ),`
`423`	`431`	`array(`
`424`	`432`	`'DELETE FROM tbl WHERE id < 10',`
`425`	`433`	array('`tbl`')
`426`	`434`	`),`
	`435`	`+ array(`
	`436`	`+ 'DELETE FROM 0tbl WHERE id < 10',`
	`437`	+ array('`0tbl`')
	`438`	`+ ),`
`427`	`439`	`array(`
`428`	`440`	`'TRUNCATE tbl',`
`429`	`441`	array('`tbl`')

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.