[patch] sandbox-execve-LD_PRELOAD.patch

sandbox-execve-LD_PRELOAD.patch (text/plain), 1.90 KB, created by Martin Schlemmer (RETIRED) on 2004-02-27 16:02:22 UTC

Index: libsandbox.c
===================================================================
RCS file: /home/cvsroot/gentoo-src/portage/src/sandbox-1.1/libsandbox.c,v
retrieving revision 1.14
diff -u -p -r1.14 libsandbox.c
--- libsandbox.c	2 Nov 2003 19:08:06 -0000	1.14
+++ libsandbox.c	27 Feb 2004 23:58:35 -0000
@@ -758,16 +758,12 @@ execve(const char *filename, char *const
 					new_envp = strndupa(old_envp, max_envp_len - 1);
 
 					/* LD_PRELOAD already have variables other than sandbox_lib,
-					 * thus we have to add sandbox_lib via a white space. */
-					if (0 != strcmp(envp[count], "LD_PRELOAD=")) {
-						strncpy(new_envp + strlen(old_envp), ":",
-										max_envp_len - strlen(new_envp));
-						strncpy(new_envp + strlen(old_envp) + 1, sandbox_lib,
-										max_envp_len - strlen(new_envp));
+					 * thus we have to add sandbox_lib seperated via a whitespace. */
+					if (0 != strncmp(envp[count], "LD_PRELOAD=", max_envp_len - 1)) {
+						strncat(new_envp, " ", max_envp_len - strlen(new_envp));
+						strncat(new_envp, sandbox_lib, max_envp_len - strlen(new_envp));
 					} else {
-						strncpy(new_envp +
-										strlen(old_envp), sandbox_lib,
-										max_envp_len - strlen(new_envp));
+						strncat(new_envp, sandbox_lib, max_envp_len - strlen(new_envp));
 					}
 
 					/* Valid string? */
@@ -776,7 +772,7 @@ execve(const char *filename, char *const
 					/* envp[count] = new_envp;
 					 *
 					 * Get rid of the "read-only" warnings */
-					memcpy((void *) &envp[count], &new_envp, sizeof (new_envp));
+					memcpy((char *) &envp[count], (char *) &new_envp, sizeof (char *));
 
 					break;
 				}
@@ -793,7 +789,7 @@ execve(const char *filename, char *const
 			/* Restore envp[count] again.
 			 * 
 			 * envp[count] = old_envp; */
-			memcpy((void *) &envp[count], &old_envp, sizeof (old_envp));
+			memcpy((char *) &envp[count], (char *) &old_envp, sizeof (char *));
 			old_envp = NULL;
 		}
 		}