aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-06-02 18:34:39 +0200
committerAndreas Schneider <asn@cryptomilk.org>2013-06-02 19:33:57 +0200
commit494fb26b01a387334ff3ac2a93cb6999e8609879 (patch)
treee93a28dc6979f8012efe32cd2869a31478ca051e
parentd0f93206029de1ab5b5958ede33d783c0b7d2508 (diff)
downloadlibssh-494fb26b01a387334ff3ac2a93cb6999e8609879.tar.gz
libssh-494fb26b01a387334ff3ac2a93cb6999e8609879.tar.xz
libssh-494fb26b01a387334ff3ac2a93cb6999e8609879.zip
opts: Fix segfault in option parser.
-rw-r--r--src/options.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/options.c b/src/options.c
index 5b3f1d1f..398242be 100644
--- a/src/options.c
+++ b/src/options.c
@@ -698,7 +698,7 @@ int ssh_options_getopt(ssh_session session, int *argcptr, char **argv) {
char *cipher = NULL;
char *identity = NULL;
char *port = NULL;
- char **save = NULL;
+ char **save = NULL, **tmp;
int i = 0;
int argc = *argcptr;
int debuglevel = 0;
@@ -757,7 +757,6 @@ int ssh_options_getopt(ssh_session session, int *argcptr, char **argv) {
break;
default:
{
- char **tmp;
char opt[3]="- ";
opt[1] = optopt;
tmp = realloc(save, (current + 1) * sizeof(char*));
@@ -782,7 +781,16 @@ int ssh_options_getopt(ssh_session session, int *argcptr, char **argv) {
} /* while */
opterr = saveopterr;
while (optind < argc) {
- save[current++] = argv[optind++];
+ tmp = realloc(save, (current + 1) * sizeof(char*));
+ if (tmp == NULL) {
+ SAFE_FREE(save);
+ ssh_set_error_oom(session);
+ return -1;
+ }
+ save = tmp;
+ save[current] = argv[optind];
+ current++;
+ optind++;
}
if (usersa && usedss) {