# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # wy7mpxasgx1t2vjp # target_branch: http://bzr.savannah.gnu.org/r/pdf/libgnupdf/branches\ # /trunk/ # testament_sha1: e91918e4022991c4eb1e403ab165317be4442c9c # timestamp: 2009-06-17 14:22:28 +1000 # base_revision_id: address@hidden # k500wrxphi8b7sqj # # Begin patch === modified file 'AUTHORS' --- AUTHORS 2009-06-17 00:04:53 +0000 +++ AUTHORS 2009-06-17 04:17:19 +0000 @@ -73,6 +73,7 @@ Brad Hards: changed doc/gnupdf-hg.texi doc/gnupdf.texi + src/base/pdf-time.c torture/unit/base/time/pdf-time-from-string.c torture/unit/base/time/pdf-time-copy.c torture/unit/base/crypt/pdf-crypt-md-new.c === modified file 'ChangeLog' --- ChangeLog 2009-06-17 03:57:06 +0000 +++ ChangeLog 2009-06-17 04:17:19 +0000 @@ -1,5 +1,8 @@ 2009-06-17 Brad Hards + * src/base/pdf-time.c (pdf_time_span_negate): protect against null + argument. + * doc/gnupdf.texi: various typo fixes * doc/gnupdf-hg.texi (Running the unit tests): document use of === modified file 'src/base/pdf-time.c' --- src/base/pdf-time.c 2009-06-16 08:35:10 +0000 +++ src/base/pdf-time.c 2009-06-17 04:17:19 +0000 @@ -1074,6 +1074,8 @@ pdf_time_span_negate (pdf_time_span_t *p_span) { pdf_status_t p_status = PDF_OK; + if (p_span == NULL) + return PDF_ERROR; pdf_i64_neg(p_span, *p_span, &p_status); return p_status; } # Begin bundle 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