From 1e4d9c23583f15b1ceda03fdc0d1fc00c9c81a8a Mon Sep 17 00:00:00 2001 From: Sebastian Rasmussen Date: Tue, 14 Aug 2012 16:07:00 +0200 Subject: Instead of giving error, throw exception when password is invalid Previously this triggered an assertion in the cleanup code when freeing the partially opened document. --- apps/pdfapp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/pdfapp.c b/apps/pdfapp.c index 1a17e172..fac34261 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -105,7 +105,7 @@ void pdfapp_open(pdfapp_t *app, char *filename, int reload) { password = winpassword(app, filename); if (!password) - pdfapp_error(app, "Needs a password."); + fz_throw(ctx, "Needs a password"); okay = fz_authenticate_password(app->doc, password); if (!okay) pdfapp_warn(app, "Invalid password."); -- cgit v1.2.3 From 7003d3e463e8a28eeccbf97ee691efc9d744cd53 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 16 Aug 2012 14:19:31 +0200 Subject: Bump version numbers to 1.1 --- apps/pdfapp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/pdfapp.c b/apps/pdfapp.c index fac34261..7732d003 100644 --- a/apps/pdfapp.c +++ b/apps/pdfapp.c @@ -35,7 +35,7 @@ static void pdfapp_error(pdfapp_t *app, char *msg) char *pdfapp_version(pdfapp_t *app) { return - "MuPDF 1.0\n" + "MuPDF 1.1\n" "Copyright 2006-2012 Artifex Software, Inc.\n"; } -- cgit v1.2.3 From 90aba2b728774bf3816562ad5e5a37eaab70a1a7 Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Fri, 17 Aug 2012 12:36:39 +0200 Subject: Mupdfinfo: Cope with zero page pdf files. --- apps/mupdfinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps') diff --git a/apps/mupdfinfo.c b/apps/mupdfinfo.c index 279298c2..6c0a31d7 100644 --- a/apps/mupdfinfo.c +++ b/apps/mupdfinfo.c @@ -901,7 +901,7 @@ showinfo(char *filename, int show, char *pagelist) pagecount = pdf_count_pages(xref); spec = fz_strsep(&pagelist, ","); - while (spec) + while (spec && pagecount) { dash = strchr(spec, '-'); -- cgit v1.2.3