Ignore:
Timestamp:
Oct 19, 2008, 4:08:46 PM (13 years ago)
Author:
Eugene Romanenko
Message:

PDF plugin: Poppler library updated to version 0.10.0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/fofi/FoFiTrueType.cc

    r254 r257  
    44//
    55// Copyright 1999-2003 Glyph & Cog, LLC
     6//
     7//========================================================================
     8
     9//========================================================================
     10//
     11// Modified under the Poppler project - http://poppler.freedesktop.org
     12//
     13// All changes made under the Poppler project to this file are licensed
     14// under GPL version 2 or later
     15//
     16// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
     17// Copyright (C) 2007 Koji Otani <sho@bbr.jp>
     18// Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
     19// Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
     20// Copyright (C) 2008 Tomas Are Haavet <tomasare@gmail.com>
     21//
     22// To see a description of the changes please see the Changelog file that
     23// came with your tarball or type make ChangeLog if you are building from git
    624//
    725//========================================================================
     
    337355  switch (cmaps[i].fmt) {
    338356  case 0:
    339     if (c >= cmaps[i].len - 6) {
     357    if (c + 6 >= (Guint)cmaps[i].len) {
    340358      return 0;
    341359    }
     
    885903  }
    886904
     905  if (tables == NULL) {
     906    return;
     907  }
     908
    887909  // check for missing tables
    888910  // (Note: if the OS/2 table is missing, the Microsoft PCL5 driver
     
    18911913  }
    18921914  nTables -= wrongTables;
    1893   tables = (TrueTypeTable *)greallocn(tables, nTables, sizeof(TrueTypeTable));
    1894   if (!parsedOk) {
     1915  tables = (TrueTypeTable *)greallocn_checkoverflow(tables, nTables, sizeof(TrueTypeTable));
     1916  if (!parsedOk || tables == NULL) {
    18951917    return;
    18961918  }
Note: See TracChangeset for help on using the changeset viewer.