Merge branch 'master' into forms

Conflicts:
	Makefile
	apps/mudraw.c
	pdf/pdf_write.c
	win32/libmupdf-v8.vcproj

1 files changed, 4 insertions, 4 deletions

diff --git a/pdf/pdf_outline.c b/pdf/pdf_outline.c
index 48f3853c..616f5a15 100644
--- a/pdf/pdf_outline.c
+++ b/pdf/pdf_outline.c
@@ -43,16 +43,16 @@ pdf_load_outline_imp(pdf_document *xref, pdf_obj *dict)
 			dict = pdf_dict_gets(dict, "Next");
 		}
 	}
-	fz_catch(ctx)
+	fz_always(ctx)
 	{
 		for (dict = odict; dict && pdf_dict_marked(dict); dict = pdf_dict_gets(dict, "Next"))
 			pdf_dict_unmark(dict);
+	}
+	fz_catch(ctx)
+	{
 		fz_rethrow(ctx);
 	}
 
-	for (dict = odict; dict && pdf_dict_marked(dict); dict = pdf_dict_gets(dict, "Next"))
-		pdf_dict_unmark(dict);
-
 	return first;
 }