Gitweb links:
...log
http://git.netsurf-browser.org/libnslog.git/shortlog/935be21bfb31ed55ec52664a59f13c21829ae024
...commit
http://git.netsurf-browser.org/libnslog.git/commit/935be21bfb31ed55ec52664a59f13c21829ae024
...tree
http://git.netsurf-browser.org/libnslog.git/tree/935be21bfb31ed55ec52664a59f13c21829ae024
The branch, master has been updated
via 935be21bfb31ed55ec52664a59f13c21829ae024 (commit)
from 6d8c71f6e6d79ec9185bb42c75d1117add142256 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/libnslog.git/commit/?id=935be21bfb31ed55ec52664a59f13c21829ae024
commit 935be21bfb31ed55ec52664a59f13c21829ae024
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
Hopefully shut openbsd up a bit
diff --git a/src/core.c b/src/core.c
index 15cb79a..48ea5aa 100644
--- a/src/core.c
+++ b/src/core.c
@@ -59,11 +59,10 @@ static void nslog__normalise_category(nslog_category_t *cat)
cat->namelen = strlen(cat->name);
} else {
nslog__normalise_category(cat->parent);
- cat->name = malloc(strlen(cat->parent->name) +
strlen(cat->cat_name) + 2);
- strcpy(cat->name, cat->parent->name);
- strcat(cat->name, "/");
- strcat(cat->name, cat->cat_name);
- cat->namelen = strlen(cat->name);
+ int bufsz = strlen(cat->parent->name) + strlen(cat->cat_name) +
2 /* a slash and a NUL */;
+ cat->name = malloc(bufsz);
+ snprintf(cat->name, bufsz, "%s/%s", cat->parent->name,
cat->cat_name);
+ cat->namelen = bufsz - 1;
}
cat->next = nslog__all_categories;
nslog__all_categories = cat;
-----------------------------------------------------------------------
Summary of changes:
src/core.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/core.c b/src/core.c
index 15cb79a..48ea5aa 100644
--- a/src/core.c
+++ b/src/core.c
@@ -59,11 +59,10 @@ static void nslog__normalise_category(nslog_category_t *cat)
cat->namelen = strlen(cat->name);
} else {
nslog__normalise_category(cat->parent);
- cat->name = malloc(strlen(cat->parent->name) +
strlen(cat->cat_name) + 2);
- strcpy(cat->name, cat->parent->name);
- strcat(cat->name, "/");
- strcat(cat->name, cat->cat_name);
- cat->namelen = strlen(cat->name);
+ int bufsz = strlen(cat->parent->name) + strlen(cat->cat_name) +
2 /* a slash and a NUL */;
+ cat->name = malloc(bufsz);
+ snprintf(cat->name, bufsz, "%s/%s", cat->parent->name,
cat->cat_name);
+ cat->namelen = bufsz - 1;
}
cat->next = nslog__all_categories;
nslog__all_categories = cat;
--
NetSurf Parametric Logging Library
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
