提交 dfef52f6 编写于 作者: M Matt Caswell

Fix seg fault in s_time

Passing a negative value for the "-time" option to s_time results in a seg
fault. This commit fixes it so that time has to be greater than 0.
Reviewed-by: NAndy Polyakov <appro@openssl.org>
上级 668f6f08
...@@ -283,6 +283,10 @@ static int parseArgs(int argc, char **argv) ...@@ -283,6 +283,10 @@ static int parseArgs(int argc, char **argv)
if (--argc < 1) if (--argc < 1)
goto bad; goto bad;
maxTime = atoi(*(++argv)); maxTime = atoi(*(++argv));
if(maxTime <= 0) {
BIO_printf(bio_err, "time must be > 0\n");
badop = 1;
}
} else { } else {
BIO_printf(bio_err, "unknown option %s\n", *argv); BIO_printf(bio_err, "unknown option %s\n", *argv);
badop = 1; badop = 1;
...@@ -527,7 +531,8 @@ int MAIN(int argc, char **argv) ...@@ -527,7 +531,8 @@ int MAIN(int argc, char **argv)
nConn, totalTime, ((double)nConn / totalTime), bytes_read); nConn, totalTime, ((double)nConn / totalTime), bytes_read);
printf printf
("%d connections in %ld real seconds, %ld bytes read per connection\n", ("%d connections in %ld real seconds, %ld bytes read per connection\n",
nConn, (long)time(NULL) - finishtime + maxTime, bytes_read / nConn); nConn, (long)time(NULL) - finishtime + maxTime,
bytes_read / (nConn?nConn:1));
ret = 0; ret = 0;
end: end:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册