romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-24 05:47:16 +03:00
Code Issues Projects Releases Packages Wiki Activity

parseconfig: dash options can't specified with colon or equals

Browse source 
Bug: http://curl.haxx.se/bug/view.cgi?id=1297
Reported-by: Michael Osipov
This commit is contained in:
Daniel Stenberg 2013-11-06 23:57:44 +01:00
parent d81cbbcc2c
commit 0db811b69b
2 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/tool_parsecfg.c
View file

@ -35,7 +35,10 @@
#include "memdebug.h" /* keep this as LAST include */
#define CURLRC DOT_CHAR "curlrc"
#define ISSEP(x) (((x) == '=') || ((x) == ':'))
/* only acknowledge colon or equals as separators if the option was not
specified with an initial dash! */
#define ISSEP(x,dash) (!dash && (((x) == '=') || ((x) == ':')))
static const char *unslashquote(const char *line, char *param);
static char *my_get_line(FILE *fp);
@ -123,6 +126,7 @@ int parseconfig(const char *filename,
char *param;
int lineno = 0;
bool alloced_param;
bool dashed_option;
while(NULL != (aline = my_get_line(file))) {
lineno++;
@ -146,7 +150,11 @@ int parseconfig(const char *filename,
/* the option keywords starts here */
option = line;
while(*line && !ISSPACE(*line) && !ISSEP(*line))
/* the option starts with a dash? */
dashed_option = option[0]=='-'?TRUE:FALSE;
while(*line && !ISSPACE(*line) && !ISSEP(*line, dashed_option))
line++;
/* ... and has ended here */
@ -158,7 +166,7 @@ int parseconfig(const char *filename,
#endif
/* pass spaces and separator(s) */
while(*line && (ISSPACE(*line) || ISSEP(*line)))
while(*line && (ISSPACE(*line) || ISSEP(*line, dashed_option)))
line++;
/* the parameter starts here (unless quoted) */