Am 15.09.2011 23:11, schrieb Sage Weil:
> The config string is variously delimited by =, @, and /, depending on the
> field. Allow these characters to be escaped by preceeding them with \.
>
> Signed-off-by: Sage Weil <[email protected]>
> ---
> block/rbd.c | 29 +++++++++++++++++++++++++++--
> 1 files changed, 27 insertions(+), 2 deletions(-)
>
> diff --git a/block/rbd.c b/block/rbd.c
> index f64b2e0..43f0e63 100644
> --- a/block/rbd.c
> +++ b/block/rbd.c
> @@ -104,8 +104,15 @@ static int qemu_rbd_next_tok(char *dst, int dst_len,
> *p = NULL;
>
> if (delim != '\0') {
> - end = strchr(src, delim);
> - if (end) {
> + for (end = src; *end; ++end) {
> + if (*end == delim) {
> + break;
> + }
> + if (*end == '\\') {
> + end++;
> + }
> + }
If src ends with a backslash, you read beyond the end of the string.
> + if (*end == delim) {
> *p = end + 1;
> *end = '\0';
> }
> @@ -124,6 +131,19 @@ static int qemu_rbd_next_tok(char *dst, int dst_len,
> return 0;
> }
>
> +static void qemu_rbd_unescape(char *src)
> +{
> + char *p;
> +
> + for (p = src; *src; ++src, ++p) {
> + if (*src == '\\') {
> + src++;
> + }
> + *p = *src;
> + }
> + *p = '\0';
> +}
This has the same problem.
Wouldn't it make sense to have the unescape integrated in
qemu_rbd_next_tok? Or are there any places where you would want to call
it without doing a qemu_rbd_unescape() afterwards?
Kevin
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
