[libfile-mmagic-xs-perl] 04/08: Update patch format_string_fix.diff.
gregor herrmann
gregoa at debian.org
Fri Dec 27 21:01:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libfile-mmagic-xs-perl.
commit 18244e47a079c649a5c7d48a40fae9d482815afc
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Dec 27 21:55:04 2013 +0100
Update patch format_string_fix.diff.
---
debian/patches/format_string_fix.diff | 21 ++++++++-------------
src/perl-mmagic-xs.c | 2 +-
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/debian/patches/format_string_fix.diff b/debian/patches/format_string_fix.diff
index 1009d3f..e1a4ea0 100644
--- a/debian/patches/format_string_fix.diff
+++ b/debian/patches/format_string_fix.diff
@@ -17,19 +17,14 @@ Segmentation fault (core dumped)
src/perl-mmagic-xs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-diff --git a/src/perl-mmagic-xs.c b/src/perl-mmagic-xs.c
-index 019afb0..2af0d6e 100644
--- a/src/perl-mmagic-xs.c
+++ b/src/perl-mmagic-xs.c
-@@ -927,7 +927,7 @@ fmm_parse_magic_line(PerlFMM *state, char *l, int lineno)
- err = newSVpvf(
- "fmm_parse_magic_line: offset %s invalid", l);
- FMM_SET_ERROR(state, err);
-- croak(SvPV_nolen(err));
-+ croak("%s", SvPV_nolen(err));
- }
+@@ -1108,7 +1108,7 @@
- l = t;
---
-1.7.9.1
-
+ error:
+ FMM_SET_ERROR(state, err);
+- croak(SvPV_nolen(err));
++ croak("%s", SvPV_nolen(err));
+ }
+
+ /* maps to mod_mime_magic::apprentice */
diff --git a/src/perl-mmagic-xs.c b/src/perl-mmagic-xs.c
index 3ba631f..c45f77e 100644
--- a/src/perl-mmagic-xs.c
+++ b/src/perl-mmagic-xs.c
@@ -1108,7 +1108,7 @@ GetDesc:
error:
FMM_SET_ERROR(state, err);
- croak(SvPV_nolen(err));
+ croak("%s", SvPV_nolen(err));
}
/* maps to mod_mime_magic::apprentice */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-mmagic-xs-perl.git
More information about the Pkg-perl-cvs-commits
mailing list