RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

avoids malloc()ing a negative number (== very big size_t) 

some vobsub's trigger this case and cause a:
  "MPlayer interrupted by signal 2 in module: decode_video"


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6224 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pl 2002-05-29 00:32:52 +00:00
parent ccf55b9ed3
commit a55be5f2e8
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spudec.c
View File

@ -133,13 +133,21 @@ static inline void spudec_cut_image(spudec_handle_t *this)
unsigned int first_y, last_y;
unsigned char *image;
unsigned char *aimage;
for (fy = 0; fy < this->image_size && !this->aimage[fy]; fy++);
for (ly = this->stride * this->height-1; ly && !this->aimage[ly]; ly--);
first_y = fy / this->stride;
last_y = ly / this->stride;
//printf("first_y: %d, last_y: %d\n", first_y, last_y);
this->start_row += first_y;
this->height = last_y - first_y +1;
// Some subtitles trigger this condition
if (last_y + 1 > first_y ) {
this->height = last_y - first_y +1;
} else {
this->height = 0;
}
//printf("new h %d new start %d (sz %d st %d)---\n\n", this->height, this->start_row, this->image_size, this->stride);
image = malloc(2 * this->stride * this->height);
if(image){
@ -150,9 +158,12 @@ static inline void spudec_cut_image(spudec_handle_t *this)
free(this->image);
this->image = image;
this->aimage = aimage;
} else {
// We'll get NULL if 0 byte is requested and it's not an error
if (this->stride && this->height ) {
fprintf(stderr,"Fatal: update_spu: malloc requested %d bytes\n", 2 * this->stride * this->height);
}
}
else
perror("Fatal: update_spu: malloc");
}
static void spudec_process_data(spudec_handle_t *this)