summaryrefslogtreecommitdiffabout
authorLars Hjemli <larsh@hal-2004.(none)>2007-01-04 15:53:03 (UTC)
committer Lars Hjemli <larsh@hal-2004.(none)>2007-01-04 15:57:00 (UTC)
commit52e605caf573fa20fdd4fbac5e1cc69b7740b1f5 (patch) (unidiff)
tree62c7bfb147f93a850f430185961a89ee51b8470a
parent05b13194b4b40a2614692125d5037ef20c5fb20e (diff)
downloadcgit-52e605caf573fa20fdd4fbac5e1cc69b7740b1f5.zip
cgit-52e605caf573fa20fdd4fbac5e1cc69b7740b1f5.tar.gz
cgit-52e605caf573fa20fdd4fbac5e1cc69b7740b1f5.tar.bz2
Handle %xx encoding in querystring
Convert valid %xx expressions in querystring to ascii, ignore invalid expressions (i.e. eat the three characters %xx). Signed-off-by: Lars Hjemli <larsh@hal-2004.(none)>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.h2
-rw-r--r--parsing.c21
-rw-r--r--shared.c13
3 files changed, 36 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index 249650e..eb8f08c 100644
--- a/cgit.h
+++ b/cgit.h
@@ -69,2 +69,4 @@ extern void cgit_querystring_cb(const char *name, const char *value);
69 69
70extern int hextoint(char c);
71
70extern void *cgit_free_commitinfo(struct commitinfo *info); 72extern void *cgit_free_commitinfo(struct commitinfo *info);
diff --git a/parsing.c b/parsing.c
index 1b22fcf..4173dd4 100644
--- a/parsing.c
+++ b/parsing.c
@@ -81,2 +81,21 @@ int cgit_read_config(const char *filename, configfn fn)
81 81
82char *convert_query_hexchar(char *txt)
83{
84 int d1, d2;
85 if (strlen(txt) < 3) {
86 *txt = '\0';
87 return txt-1;
88 }
89 d1 = hextoint(*(txt+1));
90 d2 = hextoint(*(txt+2));
91 if (d1<0 || d2<0) {
92 strcpy(txt, txt+3);
93 return txt-1;
94 } else {
95 *txt = d1 * 16 + d2;
96 strcpy(txt+1, txt+3);
97 return txt;
98 }
99}
100
82int cgit_parse_query(char *txt, configfn fn) 101int cgit_parse_query(char *txt, configfn fn)
@@ -96,2 +115,4 @@ int cgit_parse_query(char *txt, configfn fn)
96 *t = ' '; 115 *t = ' ';
116 } else if (c=='%') {
117 t = convert_query_hexchar(t);
97 } else if (c=='&') { 118 } else if (c=='&') {
diff --git a/shared.c b/shared.c
index 7def51a..e4595fa 100644
--- a/shared.c
+++ b/shared.c
@@ -115 +115,14 @@ void *cgit_free_commitinfo(struct commitinfo *info)
115} 115}
116
117int hextoint(char c)
118{
119 if (c >= 'a' && c <= 'f')
120 return 10 + c - 'a';
121 else if (c >= 'A' && c <= 'F')
122 return 10 + c - 'A';
123 else if (c >= '0' && c <= '9')
124 return c - '0';
125 else
126 return -1;
127}
128