Page MenuHomeFreeBSD
Files F152451389

D53069.id164092.diff
No OneTemporary
Actions

D53069.id164092.diff
View Options

diff --git a/sys/contrib/libnv/bsd_nvpair.c b/sys/contrib/libnv/bsd_nvpair.c
--- a/sys/contrib/libnv/bsd_nvpair.c
+++ b/sys/contrib/libnv/bsd_nvpair.c
@@ -985,13 +985,13 @@
size = nvp->nvp_datasize;
tmp = (const char *)ptr;
for (ii = 0; ii < nvp->nvp_nitems; ii++) {
- len = strnlen(tmp, size - 1) + 1;
- size -= len;
- if (tmp[len - 1] != '\0') {
+ if (size <= 0) {
ERRNO_SET(EINVAL);
return (NULL);
}
- if (size < 0) {
+ len = strnlen(tmp, size - 1) + 1;
+ size -= len;
+ if (tmp[len - 1] != '\0') {
ERRNO_SET(EINVAL);
return (NULL);
}

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 16, 1:29 AM (9 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31568150
Default Alt Text
D53069.id164092.diff (575 B)

Event Timeline