[perl.git] branch blead, updated. v5.21.0-90-gd4825b2

[Tony Cook]

In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/d4825b278e28006bdc9c3f36ab174eade62d6c4c?hp=fe2ce09d592612ace5bf8acccba9db512adb54a5>

- Log -----------------------------------------------------------------
commit d4825b278e28006bdc9c3f36ab174eade62d6c4c
Author: Tony Cook <t...@develop-help.com>
Date:   Thu May 22 11:05:59 2014 +1000

    put va_end() in the right place
-----------------------------------------------------------------------

Summary of changes:
 perlio.c | 2 +-
 util.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perlio.c b/perlio.c
index 89b8ee6..c3767f0 100644
--- a/perlio.c
+++ b/perlio.c
@@ -4913,13 +4913,13 @@ PerlIO_vprintf(PerlIO *f, const char *fmt, va_list ap)
     va_list apc;
     Perl_va_copy(ap, apc);
     sv = vnewSVpvf(fmt, &apc);
+    va_end(apc);
 #else
     sv = vnewSVpvf(fmt, &ap);
 #endif
     s = SvPV_const(sv, len);
     wrote = PerlIO_write(f, s, len);
     SvREFCNT_dec(sv);
-    va_end(apc);
     return wrote;
 }
 
diff --git a/util.c b/util.c
index 4daf01d..39b24f0 100644
--- a/util.c
+++ b/util.c
@@ -4928,6 +4928,7 @@ Perl_my_vsnprintf(char *buffer, const Size_t len, const 
char *format, va_list ap
 # else
     retval = vsprintf(buffer, format, apc);
 # endif
+    va_end(apc);
 #else
 # ifdef HAS_VSNPRINTF
     retval = vsnprintf(buffer, len, format, ap);
@@ -4935,7 +4936,6 @@ Perl_my_vsnprintf(char *buffer, const Size_t len, const 
char *format, va_list ap
     retval = vsprintf(buffer, format, ap);
 # endif
 #endif /* #ifdef NEED_VA_COPY */
-    va_end(apc);
     /* vsprintf() shows failure with < 0 */
     if (retval < 0
 #ifdef HAS_VSNPRINTF

--
Perl5 Master Repository