projects
/
platform
/
upstream
/
libvorbis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version and copyright for the 1.3.7 release.
[platform/upstream/libvorbis.git]
/
lib
/
info.c
diff --git
a/lib/info.c
b/lib/info.c
index
b8f25ee
..
f2e39e3
100644
(file)
--- a/
lib/info.c
+++ b/
lib/info.c
@@
-6,12
+6,11
@@
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 *
- * by the Xiph.Org Foundation http
://www.xiph.org/
*
+ * by the Xiph.Org Foundation http
s://xiph.org/
*
* *
********************************************************************
function: maintain the info structure, info <-> header packets
* *
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id$
********************************************************************/
********************************************************************/
@@
-20,7
+19,6
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
#include <ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include <ogg/ogg.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
@@
-31,8
+29,8
@@
#include "misc.h"
#include "os.h"
#include "misc.h"
#include "os.h"
-#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.
5
"
-#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20
150105 (⛄⛄⛄⛄
)"
+#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.
7
"
+#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20
200704 (Reducing Environment
)"
/* helpers */
static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){
/* helpers */
static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){
@@
-48,6
+46,10
@@
static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
}
}
}
}
+static int _v_toupper(int c) {
+ return (c >= 'a' && c <= 'z') ? (c & ~('a' - 'A')) : c;
+}
+
void vorbis_comment_init(vorbis_comment *vc){
memset(vc,0,sizeof(*vc));
}
void vorbis_comment_init(vorbis_comment *vc){
memset(vc,0,sizeof(*vc));
}
@@
-79,7
+81,7
@@
void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, const char *con
static int tagcompare(const char *s1, const char *s2, int n){
int c=0;
while(c < n){
static int tagcompare(const char *s1, const char *s2, int n){
int c=0;
while(c < n){
- if(
toupper(s1[c]) !=
toupper(s2[c]))
+ if(
_v_toupper(s1[c]) != _v_
toupper(s2[c]))
return !0;
c++;
}
return !0;
c++;
}
@@
-204,6
+206,7
@@
void vorbis_info_clear(vorbis_info *vi){
static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
codec_setup_info *ci=vi->codec_setup;
static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
codec_setup_info *ci=vi->codec_setup;
+ int bs;
if(!ci)return(OV_EFAULT);
vi->version=oggpack_read(opb,32);
if(!ci)return(OV_EFAULT);
vi->version=oggpack_read(opb,32);
@@
-212,12
+215,16
@@
static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
vi->channels=oggpack_read(opb,8);
vi->rate=oggpack_read(opb,32);
vi->channels=oggpack_read(opb,8);
vi->rate=oggpack_read(opb,32);
- vi->bitrate_upper=oggpack_read(opb,32);
- vi->bitrate_nominal=oggpack_read(opb,32);
- vi->bitrate_lower=oggpack_read(opb,32);
+ vi->bitrate_upper=
(ogg_int32_t)
oggpack_read(opb,32);
+ vi->bitrate_nominal=
(ogg_int32_t)
oggpack_read(opb,32);
+ vi->bitrate_lower=
(ogg_int32_t)
oggpack_read(opb,32);
- ci->blocksizes[0]=1<<oggpack_read(opb,4);
- ci->blocksizes[1]=1<<oggpack_read(opb,4);
+ bs = oggpack_read(opb,4);
+ if(bs<0)goto err_out;
+ ci->blocksizes[0]=1<<bs;
+ bs = oggpack_read(opb,4);
+ if(bs<0)goto err_out;
+ ci->blocksizes[1]=1<<bs;
if(vi->rate<1)goto err_out;
if(vi->channels<1)goto err_out;
if(vi->rate<1)goto err_out;
if(vi->channels<1)goto err_out;
@@
-589,7
+596,8
@@
int vorbis_analysis_headerout(vorbis_dsp_state *v,
oggpack_buffer opb;
private_state *b=v->backend_state;
oggpack_buffer opb;
private_state *b=v->backend_state;
- if(!b||vi->channels<=0){
+ if(!b||vi->channels<=0||vi->channels>256){
+ b = NULL;
ret=OV_EFAULT;
goto err_out;
}
ret=OV_EFAULT;
goto err_out;
}
@@
-648,7
+656,7
@@
int vorbis_analysis_headerout(vorbis_dsp_state *v,
memset(op_code,0,sizeof(*op_code));
if(b){
memset(op_code,0,sizeof(*op_code));
if(b){
- oggpack_writeclear(&opb);
+
if(vi->channels>0)
oggpack_writeclear(&opb);
if(b->header)_ogg_free(b->header);
if(b->header1)_ogg_free(b->header1);
if(b->header2)_ogg_free(b->header2);
if(b->header)_ogg_free(b->header);
if(b->header1)_ogg_free(b->header1);
if(b->header2)_ogg_free(b->header2);