aboutsummaryrefslogtreecommitdiff
path: root/engines/queen
diff options
context:
space:
mode:
authorTorbjörn Andersson2017-08-06 20:04:40 +0200
committerTorbjörn Andersson2017-08-06 20:06:18 +0200
commit0b07029274bda575b9df8e9d0f615a0f3af75c20 (patch)
tree49a520e70c3642463270bdae1349d5b758f6a04a /engines/queen
parent9ac4a772334c0a5ac48a38f321a3a8078385e66c (diff)
downloadscummvm-rg350-0b07029274bda575b9df8e9d0f615a0f3af75c20.tar.gz
scummvm-rg350-0b07029274bda575b9df8e9d0f615a0f3af75c20.tar.bz2
scummvm-rg350-0b07029274bda575b9df8e9d0f615a0f3af75c20.zip
QUEEN: Silence GCC 7 warnings about potential buffer overflow
Use snprintf() instead of sprintf() to limit how much is written to the buffer. Note that there are other places where it looks like it could overflow, but they did not trigger warnings and I'm guessing that it doesn't overflow in reality.
Diffstat (limited to 'engines/queen')
-rw-r--r--engines/queen/command.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/queen/command.cpp b/engines/queen/command.cpp
index 2a793a51c7..3866f6eca8 100644
--- a/engines/queen/command.cpp
+++ b/engines/queen/command.cpp
@@ -61,7 +61,7 @@ void CmdText::displayTemp(InkColor color, Verb v) {
void CmdText::displayTemp(InkColor color, const char *name, bool outlined) {
char temp[MAX_COMMAND_LEN];
- sprintf(temp, "%s %s", _command, name);
+ snprintf(temp, MAX_COMMAND_LEN, "%s %s", _command, name);
display(color, temp, outlined);
}
@@ -87,7 +87,7 @@ public:
virtual void displayTemp(InkColor color, const char *name, bool outlined) {
char temp[MAX_COMMAND_LEN];
- sprintf(temp, "%s %s", name, _command);
+ snprintf(temp, MAX_COMMAND_LEN, "%s %s", name, _command);
display(color, temp, outlined);
}
@@ -119,9 +119,9 @@ public:
char temp[MAX_COMMAND_LEN];
// don't show a space after the goto and give commands in the Greek version
if (_command[1] != (char)-34 && !(_command[1] == (char)-2 && strlen(_command) > 5))
- sprintf(temp, "%s %s", _command, name);
+ snprintf(temp, MAX_COMMAND_LEN, "%s %s", _command, name);
else
- sprintf(temp, "%s%s", _command, name);
+ snprintf(temp, MAX_COMMAND_LEN, "%s%s", _command, name);
display(color, temp, outlined);
}