From 5789eb116dbbb0ecbbeaf38ea0fe4037f21199df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 2 Jun 2010 18:09:25 +0200 Subject: [PATCH] astyle formatting --- lib/checkbufferoverrun.cpp | 10 +-- lib/checkbufferoverrun.h | 2 +- test/testbufferoverrun.cpp | 164 ++++++++++++++++++------------------- 3 files changed, 88 insertions(+), 88 deletions(-) diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp index 0ef37184a..97ce58bb6 100644 --- a/lib/checkbufferoverrun.cpp +++ b/lib/checkbufferoverrun.cpp @@ -1525,13 +1525,13 @@ void CheckBufferOverrun::checkInsecureCmdLineArgs() } if (varid == 0) continue; - + // Jump to the opening curly brace tok = tok->next()->link(); if (!tok || !tok->next()) continue; tok = tok->next(); - + // Search within main() for possible buffer overruns involving argv int indentlevel = -1; for (; tok && tok->next(); tok = tok->next()) @@ -1560,16 +1560,16 @@ void CheckBufferOverrun::checkInsecureCmdLineArgs() cmdLineArgsError(tok); } else if (Token::Match(tok, "sprintf ( %var% , %str% , %varid% [", varid) && - tok->tokAt(4)->str().find("%s") != std::string::npos) + tok->tokAt(4)->str().find("%s") != std::string::npos) { cmdLineArgsError(tok); } else if (Token::Match(tok, "sprintf ( %var% , %str% , * %varid%", varid) && - tok->tokAt(4)->str().find("%s") != std::string::npos) + tok->tokAt(4)->str().find("%s") != std::string::npos) { cmdLineArgsError(tok); } - + } } diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h index 2408b65e9..fcffd04e1 100644 --- a/lib/checkbufferoverrun.h +++ b/lib/checkbufferoverrun.h @@ -97,7 +97,7 @@ public: /** Check for buffer overruns due to allocating strlen(src) bytes instead of (strlen(src)+1) bytes before copying a string */ void checkBufferAllocatedWithStrlen(); - + /** Check for buffer overruns due to copying command-line args to fixed-sized buffers without bounds checking */ void checkInsecureCmdLineArgs(); diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp index 6a9613650..9402753e4 100644 --- a/test/testbufferoverrun.cpp +++ b/test/testbufferoverrun.cpp @@ -170,7 +170,7 @@ private: TEST_CASE(crash); // Ticket #1587 - crash TEST_CASE(executionPaths1); - + TEST_CASE(cmdLineArgs1); } @@ -2293,114 +2293,114 @@ private: "}\n"); ASSERT_EQUALS("[test.cpp:7]: (error) Array 'buf[10][5]' index 1000 out of bounds\n", errout.str()); } - + void cmdLineArgs1() { check("int main(int argc, char* argv[])\n" - "{\n" - " char prog[10];\n" - " strcpy(prog, argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " strcpy(prog, argv[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char* argv[])\n" - "{\n" - " char prog[10] = {'\\0'};\n" - " strcat(prog, argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10] = {'\\0'};\n" + " strcat(prog, argv[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char* argv[])\n" - "{\n" - " char prog[10];\n" - " sprintf(prog, \"%s\", argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " sprintf(prog, \"%s\", argv[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char **argv, char **envp)\n" - "{\n" - " char prog[10];\n" - " strcpy(prog, argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " strcpy(prog, argv[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char **argv, char **envp)\n" - "{\n" - " char prog[10] = {'\\0'};\n" - " strcat(prog, argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10] = {'\\0'};\n" + " strcat(prog, argv[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char **argv, char **envp)\n" - "{\n" - " char prog[10];\n" - " sprintf(prog, \"%s\", argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " sprintf(prog, \"%s\", argv[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char **options)\n" - "{\n" - " char prog[10];\n" - " strcpy(prog, options[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " strcpy(prog, options[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char **options)\n" - "{\n" - " char prog[10] = {'\\0'};\n" - " strcat(prog, options[0]);\n" - "}\n"); - + "{\n" + " char prog[10] = {'\\0'};\n" + " strcat(prog, options[0]);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char **options)\n" - "{\n" - " char prog[10];\n" - " sprintf(prog, \"%s\", *options);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " sprintf(prog, \"%s\", *options);\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:4]: (error) Buffer overrun possible for long cmd-line args\n", errout.str()); - + check("int main(int argc, char **argv, char **envp)\n" - "{\n" - " char prog[10];\n" - " if (strlen(argv[0]) < 10)\n" - " strcpy(prog, argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " if (strlen(argv[0]) < 10)\n" + " strcpy(prog, argv[0]);\n" + "}\n"); + ASSERT_EQUALS("", errout.str()); - + check("int main(int argc, char **argv, char **envp)\n" - "{\n" - " char prog[10] = {'\\0'};\n" - " if (10 > strlen(argv[0]))\n" - " strcat(prog, argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10] = {'\\0'};\n" + " if (10 > strlen(argv[0]))\n" + " strcat(prog, argv[0]);\n" + "}\n"); + ASSERT_EQUALS("", errout.str()); - + check("int main(int argc, char **argv, char **envp)\n" - "{\n" - " char prog[10];\n" - " sprintf(prog, \"%p\", argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " sprintf(prog, \"%p\", argv[0]);\n" + "}\n"); + ASSERT_EQUALS("", errout.str()); - + check("int main(int argc, char **argv, char **envp)\n" - "{\n" - " char prog[10];\n" - " argv[0][0] = '\\0';\n" - " strcpy(prog, argv[0]);\n" - "}\n"); - + "{\n" + " char prog[10];\n" + " argv[0][0] = '\\0';\n" + " strcpy(prog, argv[0]);\n" + "}\n"); + ASSERT_EQUALS("", errout.str()); } };