comparison svr-runopts.c @ 1411:798854f62430 fuzz

merge from main
author Matt Johnston <matt@ucc.asn.au>
date Wed, 14 Jun 2017 23:31:42 +0800
parents 3fdd8c5a0195 e8f67918fdc9
children 4afde04f0607
comparison
equal deleted inserted replaced
1408:27e65d3aed5f 1411:798854f62430
112 } 112 }
113 113
114 void svr_getopts(int argc, char ** argv) { 114 void svr_getopts(int argc, char ** argv) {
115 115
116 unsigned int i, j; 116 unsigned int i, j;
117 char ** next = 0; 117 char ** next = NULL;
118 int nextisport = 0; 118 int nextisport = 0;
119 char* recv_window_arg = NULL; 119 char* recv_window_arg = NULL;
120 char* keepalive_arg = NULL; 120 char* keepalive_arg = NULL;
121 char* idle_timeout_arg = NULL; 121 char* idle_timeout_arg = NULL;
122 char* keyfile = NULL; 122 char* keyfile = NULL;
287 } else if (next) { 287 } else if (next) {
288 *next = &argv[i][j]; 288 *next = &argv[i][j];
289 if (*next == NULL) { 289 if (*next == NULL) {
290 dropbear_exit("Invalid null argument"); 290 dropbear_exit("Invalid null argument");
291 } 291 }
292 next = 0x00; 292 next = NULL;
293 293
294 if (keyfile) { 294 if (keyfile) {
295 addhostkey(keyfile); 295 addhostkey(keyfile);
296 keyfile = NULL; 296 keyfile = NULL;
297 } 297 }