mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-10-16 06:06:16 +00:00
Validate parsed int pair arguments for positivity
This commit is contained in:
+3
-34
@@ -1,37 +1,3 @@
|
|||||||
// rTorrent - BitTorrent client
|
|
||||||
// Copyright (C) 2005-2011, Jari Sundell
|
|
||||||
//
|
|
||||||
// This program is free software; you can redistribute it and/or modify
|
|
||||||
// it under the terms of the GNU General Public License as published by
|
|
||||||
// the Free Software Foundation; either version 2 of the License, or
|
|
||||||
// (at your option) any later version.
|
|
||||||
//
|
|
||||||
// This program is distributed in the hope that it will be useful,
|
|
||||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
// GNU General Public License for more details.
|
|
||||||
//
|
|
||||||
// You should have received a copy of the GNU General Public License
|
|
||||||
// along with this program; if not, write to the Free Software
|
|
||||||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
//
|
|
||||||
// In addition, as a special exception, the copyright holders give
|
|
||||||
// permission to link the code of portions of this program with the
|
|
||||||
// OpenSSL library under certain conditions as described in each
|
|
||||||
// individual source file, and distribute linked combinations
|
|
||||||
// including the two.
|
|
||||||
//
|
|
||||||
// You must obey the GNU General Public License in all respects for
|
|
||||||
// all of the code used other than OpenSSL. If you modify file(s)
|
|
||||||
// with this exception, you may extend this exception to your version
|
|
||||||
// of the file(s), but you are not obligated to do so. If you do not
|
|
||||||
// wish to do so, delete this exception statement from your version.
|
|
||||||
// If you delete this exception statement from all source files in the
|
|
||||||
// program, then also delete it here.
|
|
||||||
//
|
|
||||||
// Contact: Jari Sundell <sundell.software@gmail.com>
|
|
||||||
|
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
@@ -140,5 +106,8 @@ OptionParser::call_int_pair(slot_int_pair slot, const std::string& arg) {
|
|||||||
if (std::sscanf(arg.c_str(), "%d-%d", &a, &b) != 2)
|
if (std::sscanf(arg.c_str(), "%d-%d", &a, &b) != 2)
|
||||||
throw std::runtime_error("Invalid argument, \"" + arg + "\" should be \"a-b\"");
|
throw std::runtime_error("Invalid argument, \"" + arg + "\" should be \"a-b\"");
|
||||||
|
|
||||||
|
if (a < 0 || b < 0)
|
||||||
|
throw std::runtime_error("Invalid argument, \"" + arg + "\" should be positive numbers");
|
||||||
|
|
||||||
slot(a, b);
|
slot(a, b);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user