зеркало из https://github.com/mozilla/pjs.git
Bug 559343 - Silence a Coverity warning in libtheora. r=timeless
This commit is contained in:
Родитель
5e7227f92c
Коммит
292e624298
|
@ -3,3 +3,5 @@ using the update.sh script. The changes made were those applied by update.sh,
|
|||
the addition/update of Makefile.in files for the Mozilla build system.
|
||||
|
||||
The subversion revision used was r16712.
|
||||
|
||||
bug559343.patch: Silence Coverity warning.
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/media/libtheora/lib/state.c b/media/libtheora/lib/state.c
|
||||
--- a/media/libtheora/lib/state.c
|
||||
+++ b/media/libtheora/lib/state.c
|
||||
@@ -87,17 +87,17 @@ static void oc_sb_create_plane_mapping(o
|
||||
int quadi;
|
||||
int i;
|
||||
/*Figure out how many rows of blocks in this super block lie within the
|
||||
image.*/
|
||||
jmax=_hfrags-x;
|
||||
if(jmax>4)jmax=4;
|
||||
else if(jmax<=0)break;
|
||||
/*By default, set all fragment indices to -1.*/
|
||||
- memset(_sb_maps[sbi][0],0xFF,sizeof(_sb_maps[sbi]));
|
||||
+ memset(_sb_maps[sbi],0xFF,sizeof(_sb_maps[sbi]));
|
||||
/*Fill in the fragment map for this super block.*/
|
||||
xfrag=yfrag+x;
|
||||
for(i=0;i<imax;i++){
|
||||
int j;
|
||||
for(j=0;j<jmax;j++){
|
||||
_sb_maps[sbi][SB_MAP[i][j][0]][SB_MAP[i][j][1]]=xfrag+j;
|
||||
}
|
||||
xfrag+=_hfrags;
|
|
@ -92,7 +92,7 @@ static void oc_sb_create_plane_mapping(oc_sb_map _sb_maps[],
|
|||
if(jmax>4)jmax=4;
|
||||
else if(jmax<=0)break;
|
||||
/*By default, set all fragment indices to -1.*/
|
||||
memset(_sb_maps[sbi][0],0xFF,sizeof(_sb_maps[sbi]));
|
||||
memset(_sb_maps[sbi],0xFF,sizeof(_sb_maps[sbi]));
|
||||
/*Fill in the fragment map for this super block.*/
|
||||
xfrag=yfrag+x;
|
||||
for(i=0;i<imax;i++){
|
||||
|
|
|
@ -60,3 +60,4 @@ cp $1/include/theora/theora.h ./include/theora/theora.h
|
|||
cp $1/include/theora/theoradec.h ./include/theora/theoradec.h
|
||||
cp $1/include/theora/theoraenc.h ./include/theora/theoraenc.h
|
||||
cp $1/include/theora/codec.h ./include/theora/codec.h
|
||||
patch -p3 <bug559343.patch
|
||||
|
|
Загрузка…
Ссылка в новой задаче