external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-22 04:15:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tag: rename and rewrite sbuf_strcat()

Browse source 
In particular, don't use strncat() with a length derived from the
source.
This commit is contained in:
Daniel Eklöf 2019-01-07 18:26:48 +01:00
parent f0cc0b4383
commit 400a92fa04
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tag.c
View file

@ -373,27 +373,25 @@ struct sbuf {
}; };
static void static void
sbuf_strncat(struct sbuf *s1, const char *s2, size_t n) sbuf_append_at_most(struct sbuf *s1, const char *s2, size_t n)
{ {
size_t s2_actual_len = strlen(s2); if (s1->len + n >= s1->size) {
size_t s2_len = s2_actual_len < n ? s2_actual_len : n; size_t required_size = s1->len + n + 1;
if (s1->len + s2_len >= s1->size) {
size_t required_size = s1->len + s2_len + 1;
s1->size = 2 * required_size; s1->size = 2 * required_size;
s1->s = realloc(s1->s, s1->size); s1->s = realloc(s1->s, s1->size);
s1->s[s1->len] = '\0'; //s1->s[s1->len] = '\0';
} }
strncat(s1->s, s2, s2_len); memcpy(&s1->s[s1->len], s2, n);
s1->len += s2_len; s1->len += n;
s1->s[s1->len] = '\0';
} }
static void static void
sbuf_strcat(struct sbuf *s1, const char *s2) sbuf_append(struct sbuf *s1, const char *s2)
{ {
sbuf_strncat(s1, s2, strlen(s2)); sbuf_append_at_most(s1, s2, strlen(s2));
} }
char * char *
@ -409,7 +407,7 @@ tags_expand_template(const char *template, const struct tag_set *tags)
if (begin == NULL) { if (begin == NULL) {
/* No more tags, copy remaining characters */ /* No more tags, copy remaining characters */
sbuf_strcat(&formatted, template); sbuf_append(&formatted, template);
break; break;
} }
@ -417,7 +415,7 @@ tags_expand_template(const char *template, const struct tag_set *tags)
const char *end = strchr(begin, '}'); const char *end = strchr(begin, '}');
if (end == NULL) { if (end == NULL) {
/* Wasn't actually a tag, copy as-is instead */ /* Wasn't actually a tag, copy as-is instead */
sbuf_strncat(&formatted, template, begin - template + 1); sbuf_append_at_most(&formatted, template, begin - template + 1);
template = begin + 1; template = begin + 1;
continue; continue;
} }
@ -431,17 +429,17 @@ tags_expand_template(const char *template, const struct tag_set *tags)
const struct tag *tag = tag_for_name(tags, tag_name); const struct tag *tag = tag_for_name(tags, tag_name);
if (tag == NULL) { if (tag == NULL) {
/* No such tag, copy as-is instead */ /* No such tag, copy as-is instead */
sbuf_strncat(&formatted, template, begin - template + 1); sbuf_append_at_most(&formatted, template, begin - template + 1);
template = begin + 1; template = begin + 1;
continue; continue;
} }
/* Copy characters preceeding the tag (name) */ /* Copy characters preceeding the tag (name) */
sbuf_strncat(&formatted, template, begin - template); sbuf_append_at_most(&formatted, template, begin - template);
/* Copy tag value */ /* Copy tag value */
const char *value = tag->as_string(tag); const char *value = tag->as_string(tag);
sbuf_strcat(&formatted, value); sbuf_append(&formatted, value);
/* Skip past tag name + closing '}' */ /* Skip past tag name + closing '}' */
template = end + 1; template = end + 1;