Skip to content

Commit 8aff7f0

Browse files
committed
Fix "passing NULL to non-pointer argument" warnings in intl
The second argument to spprintf is a size_t (maximum length).
1 parent 8345abc commit 8aff7f0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ext/intl/breakiterator/breakiterator_methods.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static void _breakiter_factory(const char *func_name,
5353

5454
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s!",
5555
&locale_str, &dummy) == FAILURE) {
56-
spprintf(&msg, NULL, "%s: bad arguments", func_name);
56+
spprintf(&msg, 0, "%s: bad arguments", func_name);
5757
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
5858
efree(msg);
5959
RETURN_NULL();
@@ -66,7 +66,7 @@ static void _breakiter_factory(const char *func_name,
6666
biter = func(Locale::createFromName(locale_str), status);
6767
intl_error_set_code(NULL, status TSRMLS_CC);
6868
if (U_FAILURE(status)) {
69-
spprintf(&msg, NULL, "%s: error creating BreakIterator",
69+
spprintf(&msg, 0, "%s: error creating BreakIterator",
7070
func_name);
7171
intl_error_set_custom_msg(NULL, msg, 1 TSRMLS_CC);
7272
efree(msg);
@@ -201,7 +201,7 @@ static void _breakiter_no_args_ret_int32(
201201
object = getThis();
202202

203203
if (zend_parse_parameters_none() == FAILURE) {
204-
spprintf(&msg, NULL, "%s: bad arguments", func_name);
204+
spprintf(&msg, 0, "%s: bad arguments", func_name);
205205
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
206206
efree(msg);
207207
RETURN_FALSE;
@@ -225,7 +225,7 @@ static void _breakiter_int32_ret_int32(
225225
object = getThis();
226226

227227
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &arg) == FAILURE) {
228-
spprintf(&msg, NULL, "%s: bad arguments", func_name);
228+
spprintf(&msg, 0, "%s: bad arguments", func_name);
229229
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
230230
efree(msg);
231231
RETURN_FALSE;
@@ -234,7 +234,7 @@ static void _breakiter_int32_ret_int32(
234234
BREAKITER_METHOD_FETCH_OBJECT;
235235

236236
if (arg < INT32_MIN || arg > INT32_MAX) {
237-
spprintf(&msg, NULL, "%s: offset argument is outside bounds of "
237+
spprintf(&msg, 0, "%s: offset argument is outside bounds of "
238238
"a 32-bit wide integer", func_name);
239239
intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
240240
efree(msg);

0 commit comments

Comments
 (0)