shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-04 20:30:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

opts: Fix segfault in option parser.

Browse Source
This commit is contained in:
Andreas Schneider
2013-06-02 18:34:39 +02:00
parent d0f9320602
commit 494fb26b01
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/options.c
View File

@@ -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) {