Switch from Newz to Newxz

[p5sagit/Sub-Name.git] / Name.xs

diff --git a/Name.xs b/Name.xs
index f6d7bc2..31dbde4 100644 (file)
--- a/Name.xs
+++ b/Name.xs
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004, 2008  Matthijs van Duin.  All rights reserved.
+ * Copyright (C) 2014, cPanel Inc.  All rights reserved.
  * This program is free software; you can redistribute it and/or modify
  * it under the same terms as Perl itself.
  */
@@ -17,6 +18,9 @@ static MGVTBL subname_vtbl;
 #define SvMAGIC_set(sv, val) (SvMAGIC(sv) = (val))
 #endif
 
+#ifndef Newxz
+#define Newxz(ptr, num, type)  Newz(0, ptr, num, type)
+#endif
 
 MODULE = Sub::Name  PACKAGE = Sub::Name
 
@@ -30,7 +34,7 @@ subname(name, sub)
        CV *cv = NULL;
        GV *gv;
        HV *stash = CopSTASH(PL_curcop);
-       char *s, *end = NULL, saved;
+       char *s, *end = NULL;
        MAGIC *mg;
     PPCODE:
        if (!SvROK(sub) && SvGMAGICAL(sub))
@@ -57,13 +61,12 @@ subname(name, sub)
                        end = s;
        }
        s--;
-       if (end) {
-               saved = *end;
-               *end = 0;
-               stash = GvHV(gv_fetchpv(name, TRUE, SVt_PVHV));
-               *end = saved;
-               name = end;
-       }
+        if (end) {
+               char *namepv = savepvn(name, end - name);
+               stash = GvHV(gv_fetchpv(namepv, TRUE, SVt_PVHV));
+               Safefree(namepv);
+                name = end;
+        }
        gv = (GV *) newSV(0);
        gv_init(gv, stash, name, s - name, TRUE);
 
@@ -71,7 +74,7 @@ subname(name, sub)
        while (mg && mg->mg_virtual != &subname_vtbl)
                mg = mg->mg_moremagic;
        if (!mg) {
-               Newz(702, mg, 1, MAGIC);
+               Newxz(mg, 1, MAGIC);
                mg->mg_moremagic = SvMAGIC(cv);
                mg->mg_type = PERL_MAGIC_ext;
                mg->mg_virtual = &subname_vtbl;