diff options
| -rw-r--r-- | src/shared/bus-label.c | 21 | ||||
| -rw-r--r-- | src/shared/bus-label.h | 9 |
2 files changed, 19 insertions, 11 deletions
diff --git a/src/shared/bus-label.c b/src/shared/bus-label.c index 9e9eaf4003..ccc9f2bf8e 100644 --- a/src/shared/bus-label.c +++ b/src/shared/bus-label.c @@ -63,34 +63,35 @@ char *bus_label_escape(const char *s) { return r; } -char *bus_label_unescape(const char *f) { +char *bus_label_unescape_n(const char *f, size_t l) { char *r, *t; + size_t i; assert_return(f, NULL); /* Special case for the empty string */ - if (streq(f, "_")) + if (l == 1 && *f == '_') return strdup(""); - r = new(char, strlen(f) + 1); + r = new(char, l + 1); if (!r) return NULL; - for (t = r; *f; f++) { - - if (*f == '_') { + for (i = 0, t = r; i < l; ++i) { + if (f[i] == '_') { int a, b; - if ((a = unhexchar(f[1])) < 0 || - (b = unhexchar(f[2])) < 0) { + if (l - i < 3 || + (a = unhexchar(f[i + 1])) < 0 || + (b = unhexchar(f[i + 2])) < 0) { /* Invalid escape code, let's take it literal then */ *(t++) = '_'; } else { *(t++) = (char) ((a << 4) | b); - f += 2; + i += 2; } } else - *(t++) = *f; + *(t++) = f[i]; } *t = 0; diff --git a/src/shared/bus-label.h b/src/shared/bus-label.h index c27c8517fd..ed1dc4e0a7 100644 --- a/src/shared/bus-label.h +++ b/src/shared/bus-label.h @@ -21,5 +21,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ +#include <stdlib.h> +#include <string.h> + char *bus_label_escape(const char *s); -char *bus_label_unescape(const char *f); +char *bus_label_unescape_n(const char *f, size_t l); + +static inline char *bus_label_unescape(const char *f) { + return bus_label_unescape_n(f, f ? strlen(f) : 0); +} |