Merge pull request #1184 from CrowCpp/alert-fix-1

gittiver · web-flow · commit b60d2d5b3c89 · 2026-05-11T17:24:22.000+02:00
Prevent possible integer overflow on multiplication
diff --git a/include/crow/json.h b/include/crow/json.h
@@ -1862,14 +1862,14 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                 out.push_back('"');
             }
 
-            inline void dump_indentation_part(std::string& out, const int indent, const char separator, const int indent_level) const
+            inline void dump_indentation_part(std::string& out, const size_t indent, const char separator, const int indent_level) const
             {
                 out.push_back('\n');
                 out.append(indent_level * indent, separator);
             }
 
 
-            inline void dump_internal(const wvalue& v, std::string& out, const int indent, const char separator, const int indent_level = 0) const
+            inline void dump_internal(const wvalue& v, std::string& out, const size_t indent, const char separator, const int indent_level = 0) const
             {
                 switch (v.t_)
                 {
@@ -1965,7 +1965,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                     {
                         out.push_back('[');
 
-                        if (indent >= 0)
+                        if (indent !=std::string::npos)
                         {
                             dump_indentation_part(out, indent, separator, indent_level + 1);
                         }
@@ -1979,7 +1979,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                                 {
                                     out.push_back(',');
 
-                                    if (indent >= 0)
+                                    if (indent != std::string::npos)
                                     {
                                         dump_indentation_part(out, indent, separator, indent_level + 1);
                                     }
@@ -1989,7 +1989,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                             }
                         }
 
-                        if (indent >= 0)
+                        if (indent !=std::string::npos)
                         {
                             dump_indentation_part(out, indent, separator, indent_level);
                         }
@@ -2001,7 +2001,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                     {
                         out.push_back('{');
 
-                        if (indent >= 0)
+                        if (indent != std::string::npos)
                         {
                             dump_indentation_part(out, indent, separator, indent_level + 1);
                         }
@@ -2014,7 +2014,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                                 if (!first)
                                 {
                                     out.push_back(',');
-                                    if (indent >= 0)
+                                    if (indent != std::string::npos)
                                     {
                                         dump_indentation_part(out, indent, separator, indent_level + 1);
                                     }
@@ -2023,7 +2023,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                                 dump_string(kv.first, out);
                                 out.push_back(':');
 
-                                if (indent >= 0)
+                                if (indent != std::string::npos)
                                 {
                                     out.push_back(' ');
                                 }
@@ -2032,7 +2032,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
                             }
                         }
 
-                        if (indent >= 0)
+                        if (indent != std::string::npos)
                         {
                             dump_indentation_part(out, indent, separator, indent_level);
                         }
@@ -2048,7 +2048,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
             }
 
         public:
-            std::string dump(const int indent, const char separator = ' ') const
+            std::string dump(const size_t indent, const char separator = ' ') const
             {
                 std::string ret;
                 ret.reserve(estimate_length());
@@ -2058,7 +2058,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"
 
             std::string dump() const override
             {
-                static constexpr int DontIndent = -1;
+                static constexpr size_t DontIndent = std::string::npos;
 
                 return dump(DontIndent);
             }

Original file line number	Diff line number	Diff line change
`@@ -1862,14 +1862,14 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`1862`	`1862`	`out.push_back('"');`
`1863`	`1863`	`}`
`1864`	`1864`
`1865`		`- inline void dump_indentation_part(std::string& out, const int indent, const char separator, const int indent_level) const`
	`1865`	`+ inline void dump_indentation_part(std::string& out, const size_t indent, const char separator, const int indent_level) const`
`1866`	`1866`	`{`
`1867`	`1867`	`out.push_back('\n');`
`1868`	`1868`	`out.append(indent_level * indent, separator);`
`1869`	`1869`	`}`
`1870`	`1870`
`1871`	`1871`
`1872`		`- inline void dump_internal(const wvalue& v, std::string& out, const int indent, const char separator, const int indent_level = 0) const`
	`1872`	`+ inline void dump_internal(const wvalue& v, std::string& out, const size_t indent, const char separator, const int indent_level = 0) const`
`1873`	`1873`	`{`
`1874`	`1874`	`switch (v.t_)`
`1875`	`1875`	`{`
`@@ -1965,7 +1965,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`1965`	`1965`	`{`
`1966`	`1966`	`out.push_back('[');`
`1967`	`1967`
`1968`		`- if (indent >= 0)`
	`1968`	`+ if (indent !=std::string::npos)`
`1969`	`1969`	`{`
`1970`	`1970`	`dump_indentation_part(out, indent, separator, indent_level + 1);`
`1971`	`1971`	`}`
`@@ -1979,7 +1979,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`1979`	`1979`	`{`
`1980`	`1980`	`out.push_back(',');`
`1981`	`1981`
`1982`		`- if (indent >= 0)`
	`1982`	`+ if (indent != std::string::npos)`
`1983`	`1983`	`{`
`1984`	`1984`	`dump_indentation_part(out, indent, separator, indent_level + 1);`
`1985`	`1985`	`}`
`@@ -1989,7 +1989,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`1989`	`1989`	`}`
`1990`	`1990`	`}`
`1991`	`1991`
`1992`		`- if (indent >= 0)`
	`1992`	`+ if (indent !=std::string::npos)`
`1993`	`1993`	`{`
`1994`	`1994`	`dump_indentation_part(out, indent, separator, indent_level);`
`1995`	`1995`	`}`
`@@ -2001,7 +2001,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`2001`	`2001`	`{`
`2002`	`2002`	`out.push_back('{');`
`2003`	`2003`
`2004`		`- if (indent >= 0)`
	`2004`	`+ if (indent != std::string::npos)`
`2005`	`2005`	`{`
`2006`	`2006`	`dump_indentation_part(out, indent, separator, indent_level + 1);`
`2007`	`2007`	`}`
`@@ -2014,7 +2014,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`2014`	`2014`	`if (!first)`
`2015`	`2015`	`{`
`2016`	`2016`	`out.push_back(',');`
`2017`		`- if (indent >= 0)`
	`2017`	`+ if (indent != std::string::npos)`
`2018`	`2018`	`{`
`2019`	`2019`	`dump_indentation_part(out, indent, separator, indent_level + 1);`
`2020`	`2020`	`}`
`@@ -2023,7 +2023,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`2023`	`2023`	`dump_string(kv.first, out);`
`2024`	`2024`	`out.push_back(':');`
`2025`	`2025`
`2026`		`- if (indent >= 0)`
	`2026`	`+ if (indent != std::string::npos)`
`2027`	`2027`	`{`
`2028`	`2028`	`out.push_back(' ');`
`2029`	`2029`	`}`
`@@ -2032,7 +2032,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`2032`	`2032`	`}`
`2033`	`2033`	`}`
`2034`	`2034`
`2035`		`- if (indent >= 0)`
	`2035`	`+ if (indent != std::string::npos)`
`2036`	`2036`	`{`
`2037`	`2037`	`dump_indentation_part(out, indent, separator, indent_level);`
`2038`	`2038`	`}`
`@@ -2048,7 +2048,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`2048`	`2048`	`}`
`2049`	`2049`
`2050`	`2050`	`public:`
`2051`		`- std::string dump(const int indent, const char separator = ' ') const`
	`2051`	`+ std::string dump(const size_t indent, const char separator = ' ') const`
`2052`	`2052`	`{`
`2053`	`2053`	`std::string ret;`
`2054`	`2054`	`ret.reserve(estimate_length());`
`@@ -2058,7 +2058,7 @@ namespace crow // NOTE: Already documented in "crow/app.h"`
`2058`	`2058`
`2059`	`2059`	`std::string dump() const override`
`2060`	`2060`	`{`
`2061`		`- static constexpr int DontIndent = -1;`
	`2061`	`+ static constexpr size_t DontIndent = std::string::npos;`
`2062`	`2062`
`2063`	`2063`	`return dump(DontIndent);`
`2064`	`2064`	`}`