diff options
author | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2003-04-01 19:47:11 (GMT) |
---|---|---|
committer | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2003-04-01 19:47:11 (GMT) |
commit | 7c5ab64d4db75e4bb6dadedb578e10178554d0db (patch) | |
tree | 595854215de7ef2d85e6c624e804966c54eb422c /pdf/xpdf/Array.cc | |
parent | bfd0b848c8c81ab10698f74b77f9f0904c3161e1 (diff) |
Merge with Xpdf 2.02 and make it build
Diffstat (limited to 'pdf/xpdf/Array.cc')
-rw-r--r-- | pdf/xpdf/Array.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pdf/xpdf/Array.cc b/pdf/xpdf/Array.cc index 9c6cb34..27ecbe9 100644 --- a/pdf/xpdf/Array.cc +++ b/pdf/xpdf/Array.cc @@ -2,7 +2,7 @@ // // Array.cc // -// Copyright 1996-2002 Glyph & Cog, LLC +// Copyright 1996-2003 Glyph & Cog, LLC // //======================================================================== @@ -12,6 +12,7 @@ #pragma implementation #endif +#include <stdlib.h> #include <stddef.h> #include "gmem.h" #include "Object.h" @@ -46,9 +47,23 @@ void Array::add(Object *elem) { } Object *Array::get(int i, Object *obj) { + if (i < 0 || i >= length) { +#ifdef DEBUG_MEM + abort(); +#else + return obj->initNull(); +#endif + } return elems[i].fetch(xref, obj); } Object *Array::getNF(int i, Object *obj) { + if (i < 0 || i >= length) { +#ifdef DEBUG_MEM + abort(); +#else + return obj->initNull(); +#endif + } return elems[i].copy(obj); } |