diff options
author | Timo Teräs <timo.teras@iki.fi> | 2017-02-07 06:18:22 +0000 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-07 06:18:22 +0000 |
commit | 7d6603afecaac20b9cda0eb62a68bcd89d4ab656 (patch) | |
tree | 53a8904cfa82715eb62e55d082485ce2f989b56b /community/minidlna/10-minidlna-nfo.patch | |
parent | 52591c8b83b3b8861654896d2010933512673e8a (diff) | |
download | aports-7d6603afecaac20b9cda0eb62a68bcd89d4ab656.tar.bz2 aports-7d6603afecaac20b9cda0eb62a68bcd89d4ab656.tar.xz |
Revert "community/minidlna: patch for potential segfaults"
This reverts commit 162c6843b6a85d27398c8272d7efc0998e550328.
Reverting accidentally committed change.
Diffstat (limited to 'community/minidlna/10-minidlna-nfo.patch')
-rw-r--r-- | community/minidlna/10-minidlna-nfo.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/community/minidlna/10-minidlna-nfo.patch b/community/minidlna/10-minidlna-nfo.patch deleted file mode 100644 index fd0049faa1..0000000000 --- a/community/minidlna/10-minidlna-nfo.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://sourceforge.net/p/minidlna/bugs/294/ - ---- a/metadata.c -+++ b/metadata.c -@@ -160,7 +160,7 @@ - parse_nfo(const char *path, metadata_t *m) - { - FILE *nfo; -- char buf[65536]; -+ char *buf; - struct NameValueParserData xml; - struct stat file; - size_t nread; -@@ -172,11 +172,13 @@ - DPRINTF(E_INFO, L_METADATA, "Not parsing very large .nfo file %s\n", path); - return; - } -+ buf = malloc(file.st_size+1); -+ memset(buf, '\0', file.st_size+1); - DPRINTF(E_DEBUG, L_METADATA, "Parsing .nfo file: %s\n", path); - nfo = fopen(path, "r"); - if( !nfo ) - return; -- nread = fread(&buf, 1, sizeof(buf), nfo); -+ nread = fread(buf, 1, file.st_size, nfo); - - ParseNameValue(buf, nread, &xml, 0); - -@@ -230,6 +232,7 @@ - - ClearNameValueList(&xml); - fclose(nfo); -+ free(buf); - } - - void -@@ -676,6 +679,7 @@ - - memset(&m, '\0', sizeof(m)); - memset(&video, '\0', sizeof(video)); -+ memset(nfo, '\0', sizeof(nfo)); - - //DEBUG DPRINTF(E_DEBUG, L_METADATA, "Parsing video %s...\n", name); - if ( stat(path, &file) != 0 ) |