Merge branch 'master' into silasmariusz-exec-arg-buffer

`confirm_finished` did, and the `input_error` reached `main`.

src/rpc/exec_file.cc

@@ -1,5 +1,7 @@
 #include "config.h"
 
+#include <memory>
+
 #include "rpc/exec_file.h"
 
 // #include <cassert>
@@ -81,8 +83,9 @@ ExecFile::execute_object(const torrent::Object& rawArgs, int flags) {
   char*  argsBuffer[max_args];
   char** argsCurrent = argsBuffer;
 
-  // Size of value strings are less than 24.
-  char   valueBuffer[buffer_size+1];
+  // On the heap: a buffer of buffer_size does not belong on the stack of whichever thread runs the command.
+  auto   valueStorage = std::make_unique<char[]>(buffer_size + 1);
+  char*  valueBuffer  = valueStorage.get();
   char*  valueCurrent = valueBuffer;
 
   if (rawArgs.is_list()) {

src/rpc/exec_file.h

@@ -10,7 +10,7 @@ namespace rpc {
 class ExecFile {
 public:
   static constexpr unsigned int max_args    = 128;
-  static constexpr unsigned int buffer_size = 4096;
+  static constexpr unsigned int buffer_size = 128 * 1024;
 
   static constexpr int flag_expand_tilde = 0x1;
   static constexpr int flag_throw        = 0x2;

src/rpc/parse.cc

@@ -118,27 +118,32 @@ parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
   if (base != 0 && base != 8 && base != 10 && base != 16)
     throw torrent::input_error("Command::string_to_value_unit(...) received invalid base.");
 
+  const char* first = src;
+
   while (parse_is_space(*src))
     src++;
 
   if (src[0] == '+')
-    return src;
+    return first;
 
   if (src[0] == '-') {
     if (base == 8 || base == 16)
-      return src;
+      return first;
 
     if (src[1] == '0')
-      return src;
+      return first;
   }
 
+  if (base == 10 && src[0] == '0' && (src[1] >= '0' && src[1] <= '9'))
+    return first;
+
   char* last{};
 
   errno  = 0;
   *value = strtoll(src, &last, base);
 
   if (errno == ERANGE)
-    return src;
+    return first;
 
   if (last == src) {
     *value = 0;
@@ -148,7 +153,7 @@ parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
     if (strcasecmp(src, "true") == 0)  { *value = 1; return src + strlen("true"); }
     if (strcasecmp(src, "false") == 0) { *value = 0; return src + strlen("false"); }
 
-    return src;
+    return first;
   }
 
   switch (*last) {
@@ -156,15 +161,15 @@ parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
   case 'B': ++last; break;
   case 'k':
   case 'K':
-    if (!value_fits_shifted(*value, 10)) return src; // overflow guard
+    if (!value_fits_shifted(*value, 10)) return first; // overflow guard
     *value = *value << 10; ++last; break;
   case 'm':
   case 'M':
-    if (!value_fits_shifted(*value, 20)) return src; // overflow guard
+    if (!value_fits_shifted(*value, 20)) return first; // overflow guard
     *value = *value << 20; ++last; break;
   case 'g':
   case 'G':
-    if (!value_fits_shifted(*value, 30)) return src; // overflow guard
+    if (!value_fits_shifted(*value, 30)) return first; // overflow guard
     *value = *value << 30; ++last; break;
 //   case ' ':
 //   case '\0': *value = *value * unit; break;
@@ -172,7 +177,7 @@ parse_value_nothrow(const char* src, int64_t* value, int base, int unit) {
   default:
     if (*value > std::numeric_limits<int64_t>::max() / unit ||
         *value < std::numeric_limits<int64_t>::min() / unit)
-      return src; // overflow guard
+      return first; // overflow guard
 
     *value = *value * unit;
     break;

test/Makefile.am

@@ -71,10 +71,18 @@ rtorrent_Test_Src_SOURCES = $(rtorrent_Test_Common) \
 	src/test_command_path.h \
 	src/test_command_string.cc \
 	src/test_command_string.h \
+	src/test_command_throttle.cc \
+	src/test_command_throttle.h \
 	src/test_command_tracker.cc \
 	src/test_command_tracker.h \
 	src/test_download_list.cc \
 	src/test_download_list.h \
+	src/test_input_path_input.cc \
+	src/test_input_path_input.h \
+	src/test_session_commit.cc \
+	src/test_session_commit.h \
+	src/test_session_storer.cc \
+	src/test_session_storer.h \
 	src/test_setup.cc \
 	src/test_setup.h \
 	src/test_ui_download_list.cc \