~ubuntu-branches/ubuntu/raring/libjpeg6b/raring-updates

« back to all changes in this revision

Viewing changes to jdmarker.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-11-22 08:58:58 UTC
  • Revision ID: package-import@ubuntu.com-20131122085858-n5kmkin5z4e2fsrq
Tags: 6b1-3ubuntu1.13.04.1
* SECURITY UPDATE: information disclosure via uninitialized memory in
  the get_sos function (LP: #1252912)
  - debian/patches/CVE-2013-6629.patch: check for duplications in
    jdmarker.c.
  - CVE-2013-6629
* SECURITY UPDATE: information disclosure via uninitialized memory in
  the get_dht function (LP: #1252912)
  - debian/patches/CVE-2013-6630.patch: properly clear out memory in
    jdmarker.c.
  - CVE-2013-6630

Show diffs side-by-side

added added

removed removed

Lines of Context:
342
342
    
343
343
    TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
344
344
             compptr->dc_tbl_no, compptr->ac_tbl_no);
 
345
 
 
346
    /* This CSi (cc) should differ from the previous CSi */
 
347
    for (ci = 0; ci < i; ci++) {
 
348
      if (cinfo->cur_comp_info[ci] == compptr)
 
349
        ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
 
350
    }
345
351
  }
346
352
 
347
353
  /* Collect the additional scan parameters Ss, Se, Ah/Al. */
459
465
    for (i = 0; i < count; i++)
460
466
      INPUT_BYTE(cinfo, huffval[i], return FALSE);
461
467
 
 
468
    MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
462
469
    length -= count;
463
470
 
464
471
    if (index & 0x10) {         /* AC table definition */