| 1 |
--- Macaulay2-0.9.95/Macaulay2/d/M2lib.c~ 2006-10-15 23:22:55.000000000 +0100
|
| 2 |
+++ Macaulay2-0.9.95/Macaulay2/d/M2lib.c 2006-12-28 12:59:30.000000000 +0000
|
| 3 |
@@ -368,7 +368,19 @@ char **argv;
|
| 4 |
personality(oldpersonality | ADDR_NO_RANDOMIZE);
|
| 5 |
newpersonality = personality(-1);
|
| 6 |
personality(oldpersonality | ADDR_NO_RANDOMIZE); /* just in case the previous line sets the personality to -1, which can happen */
|
| 7 |
- if ((newpersonality & ADDR_NO_RANDOMIZE) != 0) return execvp(argv[0],argv);
|
| 8 |
+ if ((newpersonality & ADDR_NO_RANDOMIZE) != 0) {
|
| 9 |
+ /* Sometimes the personality isn't inherited.
|
| 10 |
+ Prevent endless loops by adding --no-personality to
|
| 11 |
+ the command line */
|
| 12 |
+ char **new_argv = malloc((argc+2) * sizeof(char *));
|
| 13 |
+ if (!new_argv) fatal("out of memory");
|
| 14 |
+
|
| 15 |
+ new_argv[0] = argv[0];
|
| 16 |
+ new_argv[1] = "--no-personality";
|
| 17 |
+ memcpy(&new_argv[2], &argv[1], sizeof(char *) * (argc));
|
| 18 |
+
|
| 19 |
+ return execvp(new_argv[0],new_argv);
|
| 20 |
+ }
|
| 21 |
}
|
| 22 |
else personality(oldpersonality);
|
| 23 |
}
|