30 lines
976 B
Diff
30 lines
976 B
Diff
From aade7e4ff5ca87cda1c0c6503c8f0ff211c66860 Mon Sep 17 00:00:00 2001
|
|
From: Milan Crha <mcrha@redhat.com>
|
|
Date: Mon, 6 Nov 2017 14:29:09 +0100
|
|
Subject: [PATCH] Correct possible deadlock caused in
|
|
icaltimezone_load_builtin_timezone()
|
|
|
|
There had been missing icaltimezone_builtin_unlock() when the passed-in
|
|
zone had not set location, which could cause deadlock in following calls
|
|
to acquire the builtin lock.
|
|
---
|
|
src/libical/icaltimezone.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libical/icaltimezone.c b/src/libical/icaltimezone.c
|
|
index 7ed36414..58741d4c 100644
|
|
--- a/src/libical/icaltimezone.c
|
|
+++ b/src/libical/icaltimezone.c
|
|
@@ -1822,7 +1822,7 @@ static void icaltimezone_load_builtin_timezone(icaltimezone *zone)
|
|
|
|
/* If the location isn't set, it isn't a builtin timezone. */
|
|
if (!zone->location || !zone->location[0])
|
|
- return;
|
|
+ goto out;
|
|
|
|
if (use_builtin_tzdata) {
|
|
char *filename;
|
|
--
|
|
2.13.5
|
|
|