From bc635da45a32eb9b7aff6fa5f7f560ebf99092a8 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 16 Aug 2007 12:21:49 +0100
Subject: [PATCH] [cairo-ft-font] Decrement lock count on error.

As noted in http://bugs.freedesktop.org/show_bug.cgi?id=12026 the error
path of _cairo_ft_unscaled_font_lock_face() failed to reset the
unscaled->lock_count before releasing the mutex and returning NULL.
---
 src/cairo-ft-font.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 4dc61eea5..04441d0cc 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -552,6 +552,7 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
 		     unscaled->id,
 		     &face) != FT_Err_Ok)
     {
+	unscaled->lock_count--;
 	CAIRO_MUTEX_UNLOCK (unscaled->mutex);
 	_cairo_error (CAIRO_STATUS_NO_MEMORY);
 	return NULL;