summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2022-05-05 20:02:08 +0200
committerBenBE <BenBE@geshi.org>2022-05-06 14:35:50 +0200
commit9fc72c1e9c07f06bc3ca33d538e06a894778992d (patch)
tree31b4588da37b3c9404b915816b079ca48084d814
parentdb9326896845ad268436d22c0422e769af0b1a3c (diff)
Ensure buffer for environment is large enough on Solaris
-rw-r--r--solaris/Platform.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/solaris/Platform.c b/solaris/Platform.c
index 20b4d131..9c5acb5b 100644
--- a/solaris/Platform.c
+++ b/solaris/Platform.c
@@ -267,16 +267,21 @@ static int Platform_buildenv(void* accum, struct ps_prochandle* Phandle, uintptr
envAccum* accump = accum;
(void) Phandle;
(void) addr;
+
size_t thissz = strlen(str);
- if ((thissz + 2) > (accump->capacity - accump->size)) {
- accump->env = xRealloc(accump->env, accump->capacity *= 2);
- }
- if ((thissz + 2) > (accump->capacity - accump->size)) {
- return 1;
+
+ while ((thissz + 2) > (accump->capacity - accump->size)) {
+ if (accump->capacity > (SIZE_MAX / 2))
+ return 1;
+
+ accump->capacity *= 2;
+ accump->env = xRealloc(accump->env, accump->capacity);
}
- strlcpy( accump->env + accump->size, str, (accump->capacity - accump->size));
+
+ strlcpy( accump->env + accump->size, str, accump->capacity - accump->size);
strncpy( accump->env + accump->size + thissz + 1, "\n", 2);
- accump->size = accump->size + thissz + 1;
+
+ accump->size += thissz + 1;
return 0;
}
@@ -299,7 +304,8 @@ char* Platform_getProcessEnv(pid_t pid) {
Prelease(Phandle, 0);
strncpy( envBuilder.env + envBuilder.size, "\0", 1);
- return envBuilder.env;
+
+ return xRealloc(envBuilder.env, envBuilder.size + 1);
}
char* Platform_getInodeFilename(pid_t pid, ino_t inode) {

© 2014-2022 Faster IT GmbH | imprint | privacy policy