Skip to content

Commit fc2fb50

Browse files
felipenspfelipensp
committed
- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro
1 parent df3dc8d commit fc2fb50

116 files changed

Lines changed: 4 additions & 2439 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ PHP NEWS
3232
- Fixed invalid calls to free when internal fileinfo magic file is used. (Scott)
3333
- Synced changes from libmagic 4.26 to bundled libmagic. (Scott)
3434

35+
- Fixed bug #46546 (Segmentation fault when using declare statement with
36+
non-string value). (Felipe)
3537
- Fixed bug #46421 (SplFileInfo not correctly handling /). (Etienne)
3638
- Fixed bug #46331 - (Segfault when using internal fileinfo magic file on big
3739
endian systems). (Scott)

‎Zend/zend_API.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ typedef struct _zend_fcall_info_cache {
101101
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, sizeof(#name)-1, #classname, sizeof(#classname)-1, 0, allow_null, pass_by_ref, 0, 0 },
102102
#define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { #name, sizeof(#name)-1, NULL, 0, 1, allow_null, pass_by_ref, 0, 0 },
103103
#define ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, return_reference, required_num_args) \
104-
const zend_arg_info name[] = { \
104+
static const zend_arg_info name[] = { \
105105
{ NULL, 0, NULL, 0, 0, 0, pass_rest_by_reference, return_reference, required_num_args },
106106
#define ZEND_BEGIN_ARG_INFO(name, pass_rest_by_reference) \
107107
ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, ZEND_RETURN_VALUE, -1)

‎Zend/zend_builtin_functions.c‎

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -92,250 +92,201 @@ static ZEND_FUNCTION(gc_enable);
9292
static ZEND_FUNCTION(gc_disable);
9393

9494
/* {{{ arginfo */
95-
static
9695
ZEND_BEGIN_ARG_INFO(arginfo_zend_version, 0)
9796
ZEND_END_ARG_INFO()
9897

99-
static
10098
ZEND_BEGIN_ARG_INFO(arginfo_gc_collect_cycles, 0)
10199
ZEND_END_ARG_INFO()
102100

103-
static
104101
ZEND_BEGIN_ARG_INFO(arginfo_gc_enabled, 0)
105102
ZEND_END_ARG_INFO()
106103

107-
static
108104
ZEND_BEGIN_ARG_INFO(arginfo_gc_enable, 0)
109105
ZEND_END_ARG_INFO()
110106

111-
static
112107
ZEND_BEGIN_ARG_INFO(arginfo_gc_disable, 0)
113108
ZEND_END_ARG_INFO()
114109

115-
static
116110
ZEND_BEGIN_ARG_INFO(arginfo_func_num_args, 0)
117111
ZEND_END_ARG_INFO()
118112

119-
static
120113
ZEND_BEGIN_ARG_INFO_EX(arginfo_func_get_arg, 0, 0, 1)
121114
ZEND_ARG_INFO(0, arg_num)
122115
ZEND_END_ARG_INFO()
123116

124-
static
125117
ZEND_BEGIN_ARG_INFO(arginfo_func_get_args, 0)
126118
ZEND_END_ARG_INFO()
127119

128-
static
129120
ZEND_BEGIN_ARG_INFO_EX(arginfo_strlen, 0, 0, 1)
130121
ZEND_ARG_INFO(0, str)
131122
ZEND_END_ARG_INFO()
132123

133-
static
134124
ZEND_BEGIN_ARG_INFO_EX(arginfo_strcmp, 0, 0, 2)
135125
ZEND_ARG_INFO(0, str1)
136126
ZEND_ARG_INFO(0, str2)
137127
ZEND_END_ARG_INFO()
138128

139-
static
140129
ZEND_BEGIN_ARG_INFO_EX(arginfo_strncmp, 0, 0, 3)
141130
ZEND_ARG_INFO(0, str1)
142131
ZEND_ARG_INFO(0, str2)
143132
ZEND_ARG_INFO(0, len)
144133
ZEND_END_ARG_INFO()
145134

146-
static
147135
ZEND_BEGIN_ARG_INFO_EX(arginfo_strcasecmp, 0, 0, 2)
148136
ZEND_ARG_INFO(0, str1)
149137
ZEND_ARG_INFO(0, str2)
150138
ZEND_END_ARG_INFO()
151139

152-
static
153140
ZEND_BEGIN_ARG_INFO_EX(arginfo_strncasecmp, 0, 0, 3)
154141
ZEND_ARG_INFO(0, str1)
155142
ZEND_ARG_INFO(0, str2)
156143
ZEND_ARG_INFO(0, len)
157144
ZEND_END_ARG_INFO()
158145

159-
static
160146
ZEND_BEGIN_ARG_INFO_EX(arginfo_each, 0, 0, 1)
161147
ZEND_ARG_INFO(1, arr)
162148
ZEND_END_ARG_INFO()
163149

164-
static
165150
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_reporting, 0, 0, 1)
166151
ZEND_ARG_INFO(0, new_error_level)
167152
ZEND_END_ARG_INFO()
168153

169-
static
170154
ZEND_BEGIN_ARG_INFO_EX(arginfo_define, 0, 0, 3)
171155
ZEND_ARG_INFO(0, constant_name)
172156
ZEND_ARG_INFO(0, value)
173157
ZEND_ARG_INFO(0, case_insensitive)
174158
ZEND_END_ARG_INFO()
175159

176-
static
177160
ZEND_BEGIN_ARG_INFO_EX(arginfo_defined, 0, 0, 1)
178161
ZEND_ARG_INFO(0, constant_name)
179162
ZEND_END_ARG_INFO()
180163

181-
static
182164
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class, 0, 0, 0)
183165
ZEND_ARG_INFO(0, object)
184166
ZEND_END_ARG_INFO()
185167

186-
static
187168
ZEND_BEGIN_ARG_INFO(arginfo_get_called_class, 0)
188169
ZEND_END_ARG_INFO()
189170

190-
static
191171
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_parent_class, 0, 0, 0)
192172
ZEND_ARG_INFO(0, object)
193173
ZEND_END_ARG_INFO()
194174

195-
static
196175
ZEND_BEGIN_ARG_INFO_EX(arginfo_is_subclass_of, 0, 0, 2)
197176
ZEND_ARG_INFO(0, object)
198177
ZEND_ARG_INFO(0, class_name)
199178
ZEND_END_ARG_INFO()
200179

201-
static
202180
ZEND_BEGIN_ARG_INFO_EX(arginfo_is_a, 0, 0, 2)
203181
ZEND_ARG_INFO(0, object)
204182
ZEND_ARG_INFO(0, class_name)
205183
ZEND_END_ARG_INFO()
206184

207-
static
208185
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_vars, 0, 0, 1)
209186
ZEND_ARG_INFO(0, class_name)
210187
ZEND_END_ARG_INFO()
211188

212-
static
213189
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_object_vars, 0, 0, 1)
214190
ZEND_ARG_INFO(0, obj)
215191
ZEND_END_ARG_INFO()
216192

217-
static
218193
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_methods, 0, 0, 1)
219194
ZEND_ARG_INFO(0, class)
220195
ZEND_END_ARG_INFO()
221196

222-
static
223197
ZEND_BEGIN_ARG_INFO_EX(arginfo_method_exists, 0, 0, 2)
224198
ZEND_ARG_INFO(0, object)
225199
ZEND_ARG_INFO(0, method)
226200
ZEND_END_ARG_INFO()
227201

228-
static
229202
ZEND_BEGIN_ARG_INFO_EX(arginfo_property_exists, 0, 0, 2)
230203
ZEND_ARG_INFO(0, object_or_class)
231204
ZEND_ARG_INFO(0, property_name)
232205
ZEND_END_ARG_INFO()
233206

234-
static
235207
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_exists, 0, 0, 1)
236208
ZEND_ARG_INFO(0, classname)
237209
ZEND_ARG_INFO(0, autoload)
238210
ZEND_END_ARG_INFO()
239211

240-
static
241212
ZEND_BEGIN_ARG_INFO_EX(arginfo_interface_exists, 0, 0, 1)
242213
ZEND_ARG_INFO(0, classname)
243214
ZEND_ARG_INFO(0, autoload)
244215
ZEND_END_ARG_INFO()
245216

246-
static
247217
ZEND_BEGIN_ARG_INFO_EX(arginfo_function_exists, 0, 0, 1)
248218
ZEND_ARG_INFO(0, function_name)
249219
ZEND_END_ARG_INFO()
250220

251-
static
252221
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_alias, 0, 0, 2)
253222
ZEND_ARG_INFO(0, user_class_name)
254223
ZEND_ARG_INFO(0, alias_name)
255224
ZEND_ARG_INFO(0, autoload)
256225
ZEND_END_ARG_INFO()
257226

258-
static
259227
ZEND_BEGIN_ARG_INFO(arginfo_get_included_files, 0)
260228
ZEND_END_ARG_INFO()
261229

262-
static
263230
ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
264231
ZEND_ARG_INFO(0, messsage)
265232
ZEND_ARG_INFO(0, error_type)
266233
ZEND_END_ARG_INFO()
267234

268-
static
269235
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1)
270236
ZEND_ARG_INFO(0, error_handler)
271237
ZEND_ARG_INFO(0, error_types)
272238
ZEND_END_ARG_INFO()
273239

274-
static
275240
ZEND_BEGIN_ARG_INFO(arginfo_restore_error_handler, 0)
276241
ZEND_END_ARG_INFO()
277242

278-
static
279243
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
280244
ZEND_ARG_INFO(0, exception_handler)
281245
ZEND_END_ARG_INFO()
282246

283-
static
284247
ZEND_BEGIN_ARG_INFO(arginfo_restore_exception_handler, 0)
285248
ZEND_END_ARG_INFO()
286249

287-
static
288250
ZEND_BEGIN_ARG_INFO(arginfo_get_declared_classes, 0)
289251
ZEND_END_ARG_INFO()
290252

291-
static
292253
ZEND_BEGIN_ARG_INFO(arginfo_get_declared_interfaces, 0)
293254
ZEND_END_ARG_INFO()
294255

295-
static
296256
ZEND_BEGIN_ARG_INFO(arginfo_get_defined_functions, 0)
297257
ZEND_END_ARG_INFO()
298258

299-
static
300259
ZEND_BEGIN_ARG_INFO(arginfo_get_defined_vars, 0)
301260
ZEND_END_ARG_INFO()
302261

303-
static
304262
ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2)
305263
ZEND_ARG_INFO(0, args)
306264
ZEND_ARG_INFO(0, code)
307265
ZEND_END_ARG_INFO()
308266

309-
static
310267
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_resource_type, 0, 0, 1)
311268
ZEND_ARG_INFO(0, res)
312269
ZEND_END_ARG_INFO()
313270

314-
static
315271
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_loaded_extensions, 0, 0, 0)
316272
ZEND_ARG_INFO(0, zend_extensions)
317273
ZEND_END_ARG_INFO()
318274

319-
static
320275
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_constants, 0, 0, 0)
321276
ZEND_ARG_INFO(0, categorize)
322277
ZEND_END_ARG_INFO()
323278

324-
static
325279
ZEND_BEGIN_ARG_INFO(arginfo_debug_print_backtrace, 0)
326280
ZEND_END_ARG_INFO()
327281

328-
static
329282
ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_backtrace, 0, 0, 0)
330283
ZEND_ARG_INFO(0, provide_object)
331284
ZEND_END_ARG_INFO()
332285

333-
static
334286
ZEND_BEGIN_ARG_INFO_EX(arginfo_extension_loaded, 0, 0, 1)
335287
ZEND_ARG_INFO(0, extension_name)
336288
ZEND_END_ARG_INFO()
337289

338-
static
339290
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_extension_funcs, 0, 0, 1)
340291
ZEND_ARG_INFO(0, extension_name)
341292
ZEND_END_ARG_INFO()

‎Zend/zend_exceptions.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ ZEND_METHOD(exception, __toString)
605605
* And never try to change the state of exceptions and never implement anything
606606
* that gives the user anything to accomplish this.
607607
*/
608-
static
609608
ZEND_BEGIN_ARG_INFO_EX(arginfo_exception___construct, 0, 0, 0)
610609
ZEND_ARG_INFO(0, message)
611610
ZEND_ARG_INFO(0, code)
@@ -626,7 +625,6 @@ const static zend_function_entry default_exception_functions[] = {
626625
{NULL, NULL, NULL}
627626
};
628627

629-
static
630628
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_exception___construct, 0, 0, 0)
631629
ZEND_ARG_INFO(0, message)
632630
ZEND_ARG_INFO(0, code)

‎Zend/zend_interfaces.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,17 +498,14 @@ const zend_function_entry zend_funcs_iterator[] = {
498498

499499
const zend_function_entry *zend_funcs_traversable = NULL;
500500

501-
static
502501
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset, 0, 0, 1)
503502
ZEND_ARG_INFO(0, offset)
504503
ZEND_END_ARG_INFO()
505504

506-
static
507505
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_get, 0, 0, 1) /* actually this should be return by ref but atm cannot be */
508506
ZEND_ARG_INFO(0, offset)
509507
ZEND_END_ARG_INFO()
510508

511-
static
512509
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_value, 0, 0, 2)
513510
ZEND_ARG_INFO(0, offset)
514511
ZEND_ARG_INFO(0, value)
@@ -522,7 +519,6 @@ const zend_function_entry zend_funcs_arrayaccess[] = {
522519
{NULL, NULL, NULL}
523520
};
524521

525-
static
526522
ZEND_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0)
527523
ZEND_ARG_INFO(0, serialized)
528524
ZEND_END_ARG_INFO()

‎ext/bcmath/bcmath.c‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,69 +36,59 @@ static PHP_GINIT_FUNCTION(bcmath);
3636
static PHP_GSHUTDOWN_FUNCTION(bcmath);
3737

3838
/* {{{ arginfo */
39-
static
4039
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcadd, 0, 0, 2)
4140
ZEND_ARG_INFO(0, left_operand)
4241
ZEND_ARG_INFO(0, right_operand)
4342
ZEND_ARG_INFO(0, scale)
4443
ZEND_END_ARG_INFO()
4544

46-
static
4745
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsub, 0, 0, 2)
4846
ZEND_ARG_INFO(0, left_operand)
4947
ZEND_ARG_INFO(0, right_operand)
5048
ZEND_ARG_INFO(0, scale)
5149
ZEND_END_ARG_INFO()
5250

53-
static
5451
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcmul, 0, 0, 2)
5552
ZEND_ARG_INFO(0, left_operand)
5653
ZEND_ARG_INFO(0, right_operand)
5754
ZEND_ARG_INFO(0, scale)
5855
ZEND_END_ARG_INFO()
5956

60-
static
6157
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcdiv, 0, 0, 2)
6258
ZEND_ARG_INFO(0, left_operand)
6359
ZEND_ARG_INFO(0, right_operand)
6460
ZEND_ARG_INFO(0, scale)
6561
ZEND_END_ARG_INFO()
6662

67-
static
6863
ZEND_BEGIN_ARG_INFO(arginfo_bcmod, 0)
6964
ZEND_ARG_INFO(0, left_operand)
7065
ZEND_ARG_INFO(0, right_operand)
7166
ZEND_END_ARG_INFO()
7267

73-
static
7468
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpowmod, 0, 0, 3)
7569
ZEND_ARG_INFO(0, x)
7670
ZEND_ARG_INFO(0, y)
7771
ZEND_ARG_INFO(0, mod)
7872
ZEND_ARG_INFO(0, scale)
7973
ZEND_END_ARG_INFO()
8074

81-
static
8275
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpow, 0, 0, 2)
8376
ZEND_ARG_INFO(0, x)
8477
ZEND_ARG_INFO(0, y)
8578
ZEND_ARG_INFO(0, scale)
8679
ZEND_END_ARG_INFO()
8780

88-
static
8981
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsqrt, 0, 0, 1)
9082
ZEND_ARG_INFO(0, operand)
9183
ZEND_ARG_INFO(0, scale)
9284
ZEND_END_ARG_INFO()
9385

94-
static
9586
ZEND_BEGIN_ARG_INFO_EX(arginfo_bccomp, 0, 0, 2)
9687
ZEND_ARG_INFO(0, left_operand)
9788
ZEND_ARG_INFO(0, right_operand)
9889
ZEND_ARG_INFO(0, scale)
9990
ZEND_END_ARG_INFO()
10091

101-
static
10292
ZEND_BEGIN_ARG_INFO(arginfo_bcscale, 0)
10393
ZEND_ARG_INFO(0, scale)
10494
ZEND_END_ARG_INFO()

0 commit comments

Comments
 (0)