Use string2unsigned when reading/expecting an unsigned

tautschnig · tautschnig · commit 93300aaaa49b · 2018-06-25T17:29:54.000+01:00
diff --git a/jbmc/src/java_bytecode/java_bytecode_language.cpp b/jbmc/src/java_bytecode/java_bytecode_language.cpp
@@ -53,20 +53,21 @@ void java_bytecode_languaget::get_language_options(const cmdlinet &cmd)
 
   if(cmd.isset("java-max-input-array-length"))
     object_factory_parameters.max_nondet_array_length=
-      std::stoi(cmd.get_value("java-max-input-array-length"));
+      safe_string2size_t(cmd.get_value("java-max-input-array-length"));
   if(cmd.isset("java-max-input-tree-depth"))
     object_factory_parameters.max_nondet_tree_depth=
-      std::stoi(cmd.get_value("java-max-input-tree-depth"));
+      safe_string2size_t(cmd.get_value("java-max-input-tree-depth"));
   if(cmd.isset("string-max-input-length"))
     object_factory_parameters.max_nondet_string_length=
-      std::stoi(cmd.get_value("string-max-input-length"));
+      safe_string2size_t(cmd.get_value("string-max-input-length"));
   else if(cmd.isset("string-max-length"))
     object_factory_parameters.max_nondet_string_length =
-      std::stoi(cmd.get_value("string-max-length"));
+      safe_string2size_t(cmd.get_value("string-max-length"));
 
   object_factory_parameters.string_printable = cmd.isset("string-printable");
   if(cmd.isset("java-max-vla-length"))
-    max_user_array_length=std::stoi(cmd.get_value("java-max-vla-length"));
+    max_user_array_length =
+      safe_string2size_t(cmd.get_value("java-max-vla-length"));
   if(cmd.isset("symex-driven-lazy-loading"))
     lazy_methods_mode=LAZY_METHODS_MODE_EXTERNAL_DRIVER;
   else if(cmd.isset("lazy-methods"))
diff --git a/src/ansi-c/literals/convert_integer_literal.cpp b/src/ansi-c/literals/convert_integer_literal.cpp
@@ -41,7 +41,7 @@ exprt convert_integer_literal(const std::string &src)
       // and "10i" (imaginary) for GCC.
       // If it's followed by a number, we do MS mode.
       if((i+1)<src.size() && isdigit(src[i+1]))
-        width_suffix=unsafe_string2int(src.substr(i+1));
+        width_suffix=unsafe_string2unsigned(src.substr(i+1));
       else
         is_imaginary=true;
     }
diff --git a/src/goto-programs/interpreter.cpp b/src/goto-programs/interpreter.cpp
@@ -18,14 +18,16 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <algorithm>
 #include <cstring>
 
+#include <util/fixedbv.h>
+#include <util/ieee_float.h>
 #include <util/invariant.h>
+#include <util/message.h>
+#include <util/std_expr.h>
 #include <util/std_types.h>
+#include <util/string2int.h>
 #include <util/string_container.h>
 #include <util/symbol_table.h>
-#include <util/ieee_float.h>
-#include <util/fixedbv.h>
-#include <util/std_expr.h>
-#include <util/message.h>
+
 #include <json/json_parser.h>
 
 #include "interpreter_class.h"
@@ -207,7 +209,7 @@ void interpretert::command()
       stack_depth=call_stack.size()+1;
     else
     {
-      num_steps=atoi(command+1);
+      num_steps=safe_string2size_t(command+1);
       if(num_steps==0)
         num_steps=1;
     }
diff --git a/src/goto-symex/slice_by_trace.cpp b/src/goto-symex/slice_by_trace.cpp
@@ -547,7 +547,7 @@ std::set<exprt> symex_slice_by_tracet::implied_guards(exprt e)
     }
     else
     {
-      int i=unsafe_string2int(id_string.substr(merge_loc+6));
+      const std::size_t i = unsafe_string2size_t(id_string.substr(merge_loc+6));
       if(merge_impl_cache_back[i].first)
       {
         return merge_impl_cache_back[i].second;
diff --git a/src/solvers/flattening/boolbv.cpp b/src/solvers/flattening/boolbv.cpp
@@ -380,7 +380,7 @@ bvt boolbvt::convert_bv_literals(const exprt &expr)
     throw "bv_literals with wrong size";
 
   for(std::size_t i=0; i<width; i++)
-    bv[i].set(unsafe_string2int(id2string(bv_sub[i].id())));
+    bv[i].set(unsafe_string2unsigned(id2string(bv_sub[i].id())));
 
   return bv;
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ exprt convert_integer_literal(const std::string &src)`
`41`	`41`	`// and "10i" (imaginary) for GCC.`
`42`	`42`	`// If it's followed by a number, we do MS mode.`
`43`	`43`	`if((i+1)<src.size() && isdigit(src[i+1]))`
`44`		`- width_suffix=unsafe_string2int(src.substr(i+1));`
	`44`	`+ width_suffix=unsafe_string2unsigned(src.substr(i+1));`
`45`	`45`	`else`
`46`	`46`	`is_imaginary=true;`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -547,7 +547,7 @@ std::set<exprt> symex_slice_by_tracet::implied_guards(exprt e)`
`547`	`547`	`}`
`548`	`548`	`else`
`549`	`549`	`{`
`550`		`- int i=unsafe_string2int(id_string.substr(merge_loc+6));`
	`550`	`+ const std::size_t i = unsafe_string2size_t(id_string.substr(merge_loc+6));`
`551`	`551`	`if(merge_impl_cache_back[i].first)`
`552`	`552`	`{`
`553`	`553`	`return merge_impl_cache_back[i].second;`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ bvt boolbvt::convert_bv_literals(const exprt &expr)`
`380`	`380`	`throw "bv_literals with wrong size";`
`381`	`381`
`382`	`382`	`for(std::size_t i=0; i<width; i++)`
`383`		`- bv[i].set(unsafe_string2int(id2string(bv_sub[i].id())));`
	`383`	`+ bv[i].set(unsafe_string2unsigned(id2string(bv_sub[i].id())));`
`384`	`384`
`385`	`385`	`return bv;`
`386`	`386`	`}`