Unified · Split
| @@ -945,7 +945,7 @@ __bound_main_arg(int argc, char **argv, char **envp) · 944 unmodified lines | ||
| 945 | 945 | WAIT_SEM (); |
| 946 | 946 | for (i = 0; i < argc; i++) |
| 947 | 947 | tree = splay_insert((size_t) argv[i], strlen (argv[i]) + 1, tree); |
| 948 | − tree = splay_insert((size_t) argv, argc * sizeof(char *), tree); | |
| 948 | + tree = splay_insert((size_t) argv, (argc + 1) * sizeof(char *), tree); | |
| 949 | 949 | POST_SEM (); |
| 950 | 950 | #if BOUND_DEBUG |
| 951 | 951 | if (print_calls) { |
| @@ -954,7 +954,7 @@ __bound_main_arg(int argc, char **argv, char **envp) · 2 unmodified lines | ||
| 954 | 954 | __FILE__, __FUNCTION__, |
| 955 | 955 | argv[i], (unsigned long)(strlen (argv[i]) + 1)); |
| 956 | 956 | dprintf(stderr, "%s, %s(): argv %p 0x%lx\n", |
| 957 | − __FILE__, __FUNCTION__, argv, argc * sizeof(char *)); | |
| 957 | + __FILE__, __FUNCTION__, argv, (argc + 1) * sizeof(char *)); | |
| 958 | 958 | } |
| 959 | 959 | #endif |
| 960 | 960 | } |
| @@ -967,7 +967,7 @@ __bound_main_arg(int argc, char **argv, char **envp) · 6 unmodified lines | ||
| 967 | 967 | tree = splay_insert((size_t) *p, strlen (*p) + 1, tree); |
| 968 | 968 | ++p; |
| 969 | 969 | } |
| 970 | − tree = splay_insert((size_t) envp, p - envp, tree); | |
| 970 | + tree = splay_insert((size_t) envp, (++p - envp) * sizeof(char *), tree); | |
| 971 | 971 | POST_SEM (); |
| 972 | 972 | #if BOUND_DEBUG |
| 973 | 973 | if (print_calls) { |
| @@ -979,7 +979,7 @@ __bound_main_arg(int argc, char **argv, char **envp) · 5 unmodified lines | ||
| 979 | 979 | ++p; |
| 980 | 980 | } |
| 981 | 981 | dprintf(stderr, "%s, %s(): environ %p 0x%lx\n", |
| 982 | − __FILE__, __FUNCTION__, envp, p - envp); | |
| 982 | + __FILE__, __FUNCTION__, envp, (++p - envp) * sizeof(char *)); | |
| 983 | 983 | } |
| 984 | 984 | #endif |
| 985 | 985 | } |