Skip to content

Dumper.xs: use new SvVSTRING API #23165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 10, 2025
Merged

Dumper.xs: use new SvVSTRING API #23165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions dist/Data-Dumper/Dumper.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#define NEED_my_sprintf
#define NEED_sv_2pv_flags
#define NEED_utf8_to_uvchr_buf
#define NEED_sv_vstring_get
#include "ppport.h"

#ifndef strlcpy
Expand Down Expand Up @@ -1240,7 +1241,8 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
}
else {
STRLEN i;
const MAGIC *mg;
STRLEN vstr_len;
const char *vstr_pv;

if (namelen) {
id_buffer = PTR2UV(val);
Expand Down Expand Up @@ -1386,17 +1388,17 @@ DD_dump(pTHX_ SV *val, const char *name, STRLEN namelen, SV *retval, HV *seenhv,
sv_catpvs(retval, "undef");
}
#ifdef SvVOK
else if (SvMAGICAL(val) && (mg = mg_find(val, PERL_MAGIC_vstring))) {
else if (SvVOK(val) && (vstr_pv = SvVSTRING(val, vstr_len))) {
# if !defined(PL_vtbl_vstring) && PERL_VERSION_LT(5,17,0)
SV * const vecsv = sv_newmortal();
# if PERL_VERSION_LT(5,10,0)
scan_vstring(mg->mg_ptr, vecsv);
scan_vstring(vstr_pv, vecsv);
# else
scan_vstring(mg->mg_ptr, mg->mg_ptr + mg->mg_len, vecsv);
scan_vstring(vstr_pv, vstr_pv + vstr_len, vecsv);
# endif
if (!sv_eq(vecsv, val)) goto integer_came_from_string;
# endif
sv_catpvn(retval, (const char *)mg->mg_ptr, mg->mg_len);
sv_catpvn(retval, vstr_pv, vstr_len);
}
#endif

Expand Down Expand Up @@ -1701,13 +1703,13 @@ Data_Dumper__vstring(sv)
CODE:
{
#ifdef SvVOK
const MAGIC *mg;
RETVAL =
SvMAGICAL(sv) && (mg = mg_find(sv, PERL_MAGIC_vstring))
? newSVpvn((const char *)mg->mg_ptr, mg->mg_len)
: &PL_sv_undef;
#else
RETVAL = &PL_sv_undef;
if(SvVOK(sv)) {
STRLEN vstr_len;
const char *vstr_pv = SvVSTRING(sv, vstr_len);
RETVAL = newSVpvn(vstr_pv, vstr_len);
}
else
#endif
RETVAL = &PL_sv_undef;
}
OUTPUT: RETVAL
Loading