format patches

This commit is contained in:
openKylinBot 2022-05-14 01:20:23 +08:00
parent a4d9a95c56
commit 10d7d7fc28
3 changed files with 19 additions and 11 deletions

View File

@ -8,9 +8,11 @@ Applied-Upstream: https://github.com/erikd/libsndfile/commit/f833c53cb596e9e1792
src/aiff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- libsndfile.orig/src/aiff.c
+++ libsndfile/src/aiff.c
@@ -1905,7 +1905,7 @@
diff --git a/src/aiff.c b/src/aiff.c
index 6352247..d0911a0 100644
--- a/src/aiff.c
+++ b/src/aiff.c
@@ -1905,7 +1905,7 @@ aiff_read_chanmap (SF_PRIVATE * psf, unsigned dword)
psf_binheader_readf (psf, "j", dword - bytesread) ;
if (map_info->channel_map != NULL)

View File

@ -1,14 +1,18 @@
From: Emilio Pozuelo Monfort <pochu27@gmail.com>
Date: Tue, 5 Mar 2019 11:27 +0100
Date: Tue, 5 Mar 2019 11:27:00 +0100
Subject: Fix for CVE-2019-3832
Origin: https://github.com/erikd/libsndfile/pull/460
Applied-Upstream: https://github.com/erikd/libsndfile/commit/7408c4c788ce047d4e652b60a04e7796bcd7267e
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- libsndfile.orig/src/wav.c
+++ libsndfile/src/wav.c
@@ -1094,6 +1094,10 @@
src/wav.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/wav.c b/src/wav.c
index 4b943dc..6020f20 100644
--- a/src/wav.c
+++ b/src/wav.c
@@ -1094,6 +1094,10 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
psf_binheader_writef (psf, "44", 0, 0) ; /* SMTPE format */
psf_binheader_writef (psf, "44", psf->instrument->loop_count, 0) ;

View File

@ -9,8 +9,10 @@ Closes: https://github.com/erikd/libsndfile/issues/435
src/wav.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- libsndfile.orig/src/wav.c
+++ libsndfile/src/wav.c
diff --git a/src/wav.c b/src/wav.c
index 6020f20..286a57b 100644
--- a/src/wav.c
+++ b/src/wav.c
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 1999-2016 Erik de Castro Lopo <erikd@mega-nerd.com>
@ -18,7 +20,7 @@ Closes: https://github.com/erikd/libsndfile/issues/435
** Copyright (C) 2004-2005 David Viens <davidv@plogue.com>
**
** This program is free software; you can redistribute it and/or modify
@@ -1098,6 +1098,8 @@
@@ -1098,6 +1098,8 @@ wav_write_header (SF_PRIVATE *psf, int calc_length)
if (psf->instrument->loop_count > ARRAY_LEN (psf->instrument->loops))
psf->instrument->loop_count = ARRAY_LEN (psf->instrument->loops) ;