libretro/glslang
1
0
Fork 0
mirror of https://github.com/libretro/glslang.git synced 2024-12-11 18:03:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17 from google/non-existing-string

Browse Source 
Protect location setting methods from writing to non-existing strings.
This commit is contained in:
John Kessenich 2015-07-15 14:03:33 -06:00
commit a417f01041
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glslang/MachineIndependent/Scan.h
View File

@ -123,10 +123,12 @@ public:
} }
// for #line override // for #line override
void setLine(int newLine) { loc[currentSource].line = newLine; } void setLine(int newLine) { loc[getLastValidSourceIndex()].line = newLine; }
void setString(int newString) { loc[currentSource].string = newString; } void setString(int newString) { loc[getLastValidSourceIndex()].string = newString; }
const TSourceLoc& getSourceLoc() const { return loc[std::max(0, std::min(currentSource, numSources - finale - 1))]; } const TSourceLoc& getSourceLoc() const { return loc[std::max(0, std::min(currentSource, numSources - finale - 1))]; }
// Returns the index (starting from 0) of the most recent valid source string we are reading from.
int getLastValidSourceIndex() const { return std::min(currentSource, numSources - 1); }
void consumeWhiteSpace(bool& foundNonSpaceTab); void consumeWhiteSpace(bool& foundNonSpaceTab);
bool consumeComment(); bool consumeComment();