storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Handle some (apparently) common WAV file malformations.

Browse Source
This commit is contained in:
Justin Maggard 2012-03-14 08:38:59 +00:00
parent 25c74a3962
commit c9d979886b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tagutils/tagutils-wav.c
View File

@ -21,13 +21,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define GET_WAV_INT32(p) ((((uint32_t)((p)[3])) << 24) | \ #define GET_WAV_INT32(p) ((((uint8_t)((p)[3])) << 24) | \
(((uint32_t)((p)[2])) << 16) | \ (((uint8_t)((p)[2])) << 16) | \
(((uint32_t)((p)[1])) << 8) | \ (((uint8_t)((p)[1])) << 8) | \
(((uint32_t)((p)[0])))) (((uint8_t)((p)[0]))))
#define GET_WAV_INT16(p) ((((uint32_t)((p)[1])) << 8) | \ #define GET_WAV_INT16(p) ((((uint8_t)((p)[1])) << 8) | \
(((uint32_t)((p)[0])))) (((uint8_t)((p)[0]))))
static int static int
_get_wavtags(char *filename, struct song_metadata *psong) _get_wavtags(char *filename, struct song_metadata *psong)
@ -141,7 +141,7 @@ _get_wavtags(char *filename, struct song_metadata *psong)
char *tags; char *tags;
char *p; char *p;
int off; int off;
int taglen; uint32_t taglen;
char **m; char **m;
len = GET_WAV_INT32(hdr + 4); len = GET_WAV_INT32(hdr + 4);
@ -203,6 +203,11 @@ _get_wavtags(char *filename, struct song_metadata *psong)
p += taglen + 8; p += taglen + 8;
off += taglen + 8; off += taglen + 8;
/* Handle some common WAV file malformations */
while (*p == '\0') {
p++;
off++;
}
} }
free(tags); free(tags);
} }