Change 33453 by [EMAIL PROTECTED] on 2008/03/08 15:13:26
Perl_croak_nocontext() is called with NULL indirectly from
some XS-based modules.
Affected files ...
... //depot/perl/embed.fnc#599 edit
... //depot/perl/proto.h#934 edit
... //depot/perl/util.c#653 edit
Differences ...
==== //depot/perl/embed.fnc#599 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#598~33450~ 2008-03-06 10:02:22.000000000 -0800
+++ perl/embed.fnc 2008-03-08 07:13:26.000000000 -0800
@@ -149,7 +149,7 @@
Afprd |void |croak |NULLOK const char* pat|...
Apr |void |vcroak |NULLOK const char* pat|NULLOK va_list* args
#if defined(PERL_IMPLICIT_CONTEXT)
-Afnrp |void |croak_nocontext|NN const char* pat|...
+Afnrp |void |croak_nocontext|NULLOK const char* pat|...
Afnp |OP* |die_nocontext |NN const char* pat|...
Afnp |void |deb_nocontext |NN const char* pat|...
Afnp |char* |form_nocontext |NN const char* pat|...
==== //depot/perl/proto.h#934 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#933~33450~ 2008-03-06 10:02:22.000000000 -0800
+++ perl/proto.h 2008-03-08 07:13:26.000000000 -0800
@@ -330,10 +330,7 @@
#if defined(PERL_IMPLICIT_CONTEXT)
PERL_CALLCONV void Perl_croak_nocontext(const char* pat, ...)
__attribute__noreturn__
- __attribute__format__(__printf__,1,2)
- __attribute__nonnull__(1);
-#define PERL_ARGS_ASSERT_CROAK_NOCONTEXT \
- assert(pat)
+ __attribute__format__null_ok__(__printf__,1,2);
PERL_CALLCONV OP* Perl_die_nocontext(const char* pat, ...)
__attribute__format__(__printf__,1,2)
==== //depot/perl/util.c#653 (text) ====
Index: perl/util.c
--- perl/util.c#652~33408~ 2008-03-01 23:36:58.000000000 -0800
+++ perl/util.c 2008-03-08 07:13:26.000000000 -0800
@@ -1432,7 +1432,6 @@
{
dTHX;
va_list args;
- PERL_ARGS_ASSERT_CROAK_NOCONTEXT;
va_start(args, pat);
vcroak(pat, &args);
/* NOTREACHED */
End of Patch.
