Ignore:
Timestamp:
Dec 30, 2009, 7:13:45 PM (12 years ago)
Author:
rbri
Message:

PDF plugin: Poppler library updated to version 0.12.3

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/poppler/Link.cc

    r257 r277  
    1717// Copyright (C) 2007 Carlos Garcia Campos <carlosgc@gnome.org>
    1818// Copyright (C) 2008 Hugo Mercier <hmercier31@gmail.com>
    19 // Copyright (C) 2008 Albert Astals Cid <aacid@kde.org>
     19// Copyright (C) 2008, 2009 Albert Astals Cid <aacid@kde.org>
     20// Copyright (C) 2009 Kovid Goyal <kovid@kovidgoyal.net>
     21// Copyright (C) 2009 Ilya Gorenbein <igorenbein@finjan.com>
    2022//
    2123// To see a description of the changes please see the Changelog file that
     
    419421
    420422LinkGoToR::LinkGoToR(Object *fileSpecObj, Object *destObj) {
     423  fileName = NULL;
    421424  dest = NULL;
    422425  namedDest = NULL;
     
    424427  // get file name
    425428  Object obj1;
    426   getFileSpecNameForPlatform (fileSpecObj, &obj1);
    427   fileName = obj1.getString()->copy();
    428   obj1.free();
     429  if (getFileSpecNameForPlatform (fileSpecObj, &obj1)) {
     430    fileName = obj1.getString()->copy();
     431    obj1.free();
     432  }
    429433
    430434  // named destination
     
    470474  if (actionObj->isDict()) {
    471475    if (!actionObj->dictLookup("F", &obj1)->isNull()) {
    472       getFileSpecNameForPlatform (&obj1, &obj3);
    473       fileName = obj3.getString()->copy();
    474       obj3.free();
     476      if (getFileSpecNameForPlatform (&obj1, &obj3)) {
     477        fileName = obj3.getString()->copy();
     478        obj3.free();
     479      }
    475480    } else {
    476481      obj1.free();
    477 #ifdef WIN32
     482#ifdef _WIN32
    478483      if (actionObj->dictLookup("Win", &obj1)->isDict()) {
    479484        obj1.dictLookup("F", &obj2);
    480         getFileSpecNameForPlatform (&obj2, &obj3);
    481         fileName = obj3.getString()->copy();
    482         obj3.free();
     485        if (getFileSpecNameForPlatform (&obj2, &obj3)) {
     486          fileName = obj3.getString()->copy();
     487          obj3.free();
     488        }
    483489        obj2.free();
    484490        if (obj1.dictLookup("P", &obj2)->isString()) {
     
    494500      if (actionObj->dictLookup("Unix", &obj1)->isDict()) {
    495501        obj1.dictLookup("F", &obj2);
    496         getFileSpecNameForPlatform (&obj2, &obj3);
    497         fileName = obj3.getString()->copy();
    498         obj3.free();
     502        if (getFileSpecNameForPlatform (&obj2, &obj3)) {
     503          fileName = obj3.getString()->copy();
     504          obj3.free();
     505        }
    499506        obj2.free();
    500507        if (obj1.dictLookup("P", &obj2)->isString()) {
Note: See TracChangeset for help on using the changeset viewer.