Merge branch 'master' into forms

Conflicts:
	cbz/mucbz.c
	pdf/pdf_parse.c
	pdf/pdf_form.c
	xps/xps_zip.c

2 files changed, 3 insertions, 3 deletions

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, '-');
 
diff --git a/apps/pdfapp.c b/apps/pdfapp.c
index d4d292da..b95b4178 100644
--- a/apps/pdfapp.c
+++ b/apps/pdfapp.c
@@ -42,7 +42,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";
 }
 
@@ -117,7 +117,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.");