projects
/
collection4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cff7e32
)
src/graph_instance.c: Properly escape parameters.
author
Florian Forster
<ff@octo.it>
Wed, 28 Jul 2010 16:02:26 +0000
(18:02 +0200)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Wed, 28 Jul 2010 16:02:26 +0000
(18:02 +0200)
src/graph_instance.c
patch
|
blob
|
history
diff --git
a/src/graph_instance.c
b/src/graph_instance.c
index
5ca8c66
..
86cec84
100644
(file)
--- a/
src/graph_instance.c
+++ b/
src/graph_instance.c
@@
-393,6
+393,12
@@
int inst_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
buffer[0] = 0;
buffer[0] = 0;
+#define COPY_ESCAPE(str) do { \
+ char tmp[1024]; \
+ uri_escape_copy (tmp, (str), sizeof (tmp)); \
+ strlcat (buffer, tmp, buffer_size); \
+} while (0) \
+
#define COPY_FIELD(field) do { \
const char *cfg_f = ident_get_##field (cfg_select); \
const char *inst_f = ident_get_##field (inst->select); \
#define COPY_FIELD(field) do { \
const char *cfg_f = ident_get_##field (cfg_select); \
const char *inst_f = ident_get_##field (inst->select); \
@@
-400,19
+406,19
@@
int inst_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
{ \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
{ \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
-
strlcat (buffer, cfg_f, buffer_size);
\
+
COPY_ESCAPE (cfg_f);
\
} \
else \
{ \
strlcat (buffer, "graph_", buffer_size); \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
} \
else \
{ \
strlcat (buffer, "graph_", buffer_size); \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
-
strlcat (buffer, cfg_f, buffer_size);
\
+
COPY_ESCAPE (cfg_f);
\
strlcat (buffer, ";", buffer_size); \
strlcat (buffer, "inst_", buffer_size); \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
strlcat (buffer, ";", buffer_size); \
strlcat (buffer, "inst_", buffer_size); \
strlcat (buffer, #field, buffer_size); \
strlcat (buffer, "=", buffer_size); \
-
strlcat (buffer, inst_f, buffer_size);
\
+
COPY_ESCAPE (inst_f);
\
} \
} while (0)
} \
} while (0)
@@
-427,6
+433,7
@@
int inst_get_params (graph_config_t *cfg, graph_instance_t *inst, /* {{{ */
COPY_FIELD(type_instance);
#undef COPY_FIELD
COPY_FIELD(type_instance);
#undef COPY_FIELD
+#undef COPY_ESCAPE
ident_destroy (cfg_select);
ident_destroy (cfg_select);