mirror of
https://github.com/cookiengineer/audacity
synced 2025-08-16 08:34:10 +02:00
9a621647be
in id3.c: psf->fileoffset is a sf_count_t, which is int64_t, which is larger than size_t on a G4 PPC. Since psf_binheader_readf expects that argument to be the smaller size_t, it ends up seeking over and over to the zero position since the larger bits of the variable are all zeros. Patch simply casts to size_t. Patch sent upstream as well.
58 lines
1.7 KiB
C
58 lines
1.7 KiB
C
/*
|
|
** Copyright (C) 2010-2011 Erik de Castro Lopo <erikd@mega-nerd.com>
|
|
**
|
|
** This program is free software; you can redistribute it and/or modify
|
|
** it under the terms of the GNU Lesser General Public License as published by
|
|
** the Free Software Foundation; either version 2.1 of the License, or
|
|
** (at your option) any later version.
|
|
**
|
|
** This program is distributed in the hope that it will be useful,
|
|
** but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
** GNU Lesser General Public License for more details.
|
|
**
|
|
** You should have received a copy of the GNU Lesser General Public License
|
|
** along with this program; if not, write to the Free Software
|
|
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "sfconfig.h"
|
|
|
|
#include <stdio.h>
|
|
#include <fcntl.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
|
|
#include "sndfile.h"
|
|
#include "sfendian.h"
|
|
#include "common.h"
|
|
|
|
int
|
|
id3_skip (SF_PRIVATE * psf)
|
|
{ unsigned char buf [10] ;
|
|
|
|
memset (buf, 0, sizeof (buf)) ;
|
|
psf_binheader_readf (psf, "pb", (size_t)0, buf, 10) ;
|
|
|
|
if (buf [0] == 'I' && buf [1] == 'D' && buf [2] == '3')
|
|
{ int offset = buf [6] & 0x7f ;
|
|
offset = (offset << 7) | (buf [7] & 0x7f) ;
|
|
offset = (offset << 7) | (buf [8] & 0x7f) ;
|
|
offset = (offset << 7) | (buf [9] & 0x7f) ;
|
|
|
|
psf_log_printf (psf, "ID3 length : %d\n--------------------\n", offset) ;
|
|
|
|
/* Never want to jump backwards in a file. */
|
|
if (offset < 0)
|
|
return 0 ;
|
|
|
|
/* Calculate new file offset and position ourselves there. */
|
|
psf->fileoffset += offset + 10 ;
|
|
psf_binheader_readf (psf, "p", (size_t)psf->fileoffset) ;
|
|
|
|
return 1 ;
|
|
} ;
|
|
|
|
return 0 ;
|
|
} /* id3_skip */
|