Commit 4123a04c by Mark Adams

Replace sprintf() usage with snprintf()

This fixes compilation in build environments with stricter warnings enabled
parent fa540d14
...@@ -1004,7 +1004,7 @@ int TPpContext::MacroExpand(int atom, TPpToken* ppToken, bool expandUndef, bool ...@@ -1004,7 +1004,7 @@ int TPpContext::MacroExpand(int atom, TPpToken* ppToken, bool expandUndef, bool
switch (atom) { switch (atom) {
case PpAtomLineMacro: case PpAtomLineMacro:
ppToken->ival = parseContext.getCurrentLoc().line; ppToken->ival = parseContext.getCurrentLoc().line;
sprintf(ppToken->name, "%d", ppToken->ival); snprintf(ppToken->name, sizeof(ppToken->name), "%d", ppToken->ival);
UngetToken(PpAtomConstInt, ppToken); UngetToken(PpAtomConstInt, ppToken);
return 1; return 1;
...@@ -1012,14 +1012,14 @@ int TPpContext::MacroExpand(int atom, TPpToken* ppToken, bool expandUndef, bool ...@@ -1012,14 +1012,14 @@ int TPpContext::MacroExpand(int atom, TPpToken* ppToken, bool expandUndef, bool
if (parseContext.getCurrentLoc().name) if (parseContext.getCurrentLoc().name)
parseContext.ppRequireExtensions(ppToken->loc, 1, &E_GL_GOOGLE_cpp_style_line_directive, "filename-based __FILE__"); parseContext.ppRequireExtensions(ppToken->loc, 1, &E_GL_GOOGLE_cpp_style_line_directive, "filename-based __FILE__");
ppToken->ival = parseContext.getCurrentLoc().string; ppToken->ival = parseContext.getCurrentLoc().string;
sprintf(ppToken->name, "%s", ppToken->loc.getStringNameOrNum().c_str()); snprintf(ppToken->name, sizeof(ppToken->name), "%s", ppToken->loc.getStringNameOrNum().c_str());
UngetToken(PpAtomConstInt, ppToken); UngetToken(PpAtomConstInt, ppToken);
return 1; return 1;
} }
case PpAtomVersionMacro: case PpAtomVersionMacro:
ppToken->ival = parseContext.version; ppToken->ival = parseContext.version;
sprintf(ppToken->name, "%d", ppToken->ival); snprintf(ppToken->name, sizeof(ppToken->name), "%d", ppToken->ival);
UngetToken(PpAtomConstInt, ppToken); UngetToken(PpAtomConstInt, ppToken);
return 1; return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment