← Back to branch summary

~ubuntu-branches/ubuntu/raring/libav/raring-updates

« back to all changes in this revision

Viewing changes to libavcodec/pictordec.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-11-09 10:48:01 UTC
  • mfrom: (1.2.18)
  • Revision ID: package-import@ubuntu.com-20131109104801-ericmbah2eq1uwt9
Tags: 6:0.8.9-0ubuntu0.13.04.1
https://launchpad.net/bugs/1249621
Update to 0.8.9 to fix multiple security issues (LP: #1249621)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/pictordec.c
121
121
    s->nb_planes   = (tmp >> 4) + 1;
122
122
    bpp            = bits_per_plane * s->nb_planes;
123
123
    if (bits_per_plane > 8 || bpp < 1 || bpp > 32) {
124
 
        av_log_ask_for_sample(s, "unsupported bit depth\n");
 
124
        av_log_ask_for_sample(avctx, "unsupported bit depth\n");
125
125
        return AVERROR_INVALIDDATA;
126
126
    }
127
127
 
226
226
                if (bits_per_plane == 8) {
227
227
                    picmemset_8bpp(s, val, run, &x, &y);
228
228
                    if (y < 0)
229
 
                        break;
 
229
                        goto finish;
230
230
                } else {
231
231
                    picmemset(s, val, run, &x, &y, &plane, bits_per_plane);
232
232
                }
233
233
            }
234
234
        }
235
235
    } else {
236
 
        av_log_ask_for_sample(s, "uncompressed image\n");
 
236
        av_log_ask_for_sample(avctx, "uncompressed image\n");
237
237
        return avpkt->size;
238
238
    }
 
239
finish:
239
240
 
240
241
    *data_size = sizeof(AVFrame);
241
242
    *(AVFrame*)data = s->frame;