blob: 877b808fc0ad91e630aa06a57fe26308c5507081 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
New added pthread feature leads to some deadlock with some unlock code missing.
This patch fix it.
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Upstream-Status: Pending
Index: libical-0.47/src/libical/icaltimezone.c
===================================================================
--- libical-0.47.orig/src/libical/icaltimezone.c 2011-12-16 13:42:25.000000000 +0800
+++ libical-0.47/src/libical/icaltimezone.c 2011-12-16 14:16:25.000000000 +0800
@@ -1773,7 +1773,7 @@
filename = (char*) malloc (filename_len);
if (!filename) {
icalerror_set_errno(ICAL_NEWFAILED_ERROR);
- return;
+ goto out;
}
snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(),
@@ -1783,7 +1783,7 @@
free (filename);
if (!fp) {
icalerror_set_errno(ICAL_FILE_ERROR);
- return;
+ goto out;
}
@@ -1807,7 +1807,7 @@
if (!subcomp) {
icalerror_set_errno(ICAL_PARSE_ERROR);
- return;
+ goto out;
}
icaltimezone_get_vtimezone_properties (zone, subcomp);
@@ -1817,10 +1817,12 @@
icalcomponent_free(comp);
}
#endif
-#ifdef HAVE_PTHREAD
+
out:
+#ifdef HAVE_PTHREAD
pthread_mutex_unlock(&builtin_mutex);
#endif
+ return;
}
|
