@@ -46,6 +46,7 @@ extern char** environ;
46
46
#include <unistd.h>
47
47
#endif
48
48
49
+ #include <stdbool.h>
49
50
#include <string.h>
50
51
#include <stdlib.h>
51
52
@@ -154,31 +155,34 @@ char** save_ps_args(int argc, char** argv)
154
155
*/
155
156
{
156
157
char * end_of_area = NULL ;
157
- int non_contiguous_area = 0 ;
158
+ bool is_contiguous_area = true ;
158
159
int i ;
159
160
160
161
/*
161
162
* check for contiguous argv strings
162
163
*/
163
- for (i = 0 ; ( non_contiguous_area == 0 ) && (i < argc ); i ++ )
164
+ for (i = 0 ; is_contiguous_area && (i < argc ); i ++ )
164
165
{
165
- if (i != 0 && end_of_area + 1 != argv [i ])
166
- non_contiguous_area = 1 ;
166
+ if (i != 0 && end_of_area + 1 != argv [i ]) {
167
+ is_contiguous_area = false;
168
+ }
167
169
end_of_area = argv [i ] + strlen (argv [i ]);
168
170
}
169
171
170
172
/*
171
173
* check for contiguous environ strings following argv
172
174
*/
173
- for (i = 0 ; ( non_contiguous_area == 0 ) && (environ [i ] != NULL ); i ++ )
175
+ for (i = 0 ; is_contiguous_area && (environ [i ] != NULL ); i ++ )
174
176
{
175
- if (end_of_area + 1 != environ [i ])
176
- non_contiguous_area = 1 ;
177
+ if (end_of_area + 1 != environ [i ]) {
178
+ is_contiguous_area = false;
179
+ }
177
180
end_of_area = environ [i ] + strlen (environ [i ]);
178
181
}
179
182
180
- if (non_contiguous_area != 0 )
183
+ if (! is_contiguous_area ) {
181
184
goto clobber_error ;
185
+ }
182
186
183
187
ps_buffer = argv [0 ];
184
188
ps_buffer_size = end_of_area - argv [0 ];
@@ -188,8 +192,9 @@ char** save_ps_args(int argc, char** argv)
188
192
*/
189
193
new_environ = (char * * ) malloc ((i + 1 ) * sizeof (char * ));
190
194
frozen_environ = (char * * ) malloc ((i + 1 ) * sizeof (char * ));
191
- if (!new_environ || !frozen_environ )
195
+ if (!new_environ || !frozen_environ ) {
192
196
goto clobber_error ;
197
+ }
193
198
for (i = 0 ; environ [i ] != NULL ; i ++ )
194
199
{
195
200
new_environ [i ] = strdup (environ [i ]);
0 commit comments