]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/glibc/glibc-rh1256812.patch
lcdproc: Update to 0.5.7
[ipfire-2.x.git] / src / patches / glibc / glibc-rh1256812.patch
1 diff -pruN glibc-2.12-2-gc4ccff1/malloc/malloc.c glibc-2.12-2-gc4ccff1.v2/malloc/malloc.c
2 --- glibc-2.12-2-gc4ccff1/malloc/malloc.c 2015-07-24 19:29:37.679907396 +0530
3 +++ glibc-2.12-2-gc4ccff1.v2/malloc/malloc.c 2015-07-24 18:59:59.928055174 +0530
4 @@ -3737,8 +3737,7 @@ public_mALLOc(size_t bytes)
5 mstate prev = ar_ptr->next ? ar_ptr : 0;
6 (void)mutex_unlock(&ar_ptr->mutex);
7 ar_ptr = arena_get2(prev, bytes, true);
8 - if(ar_ptr)
9 - victim = _int_malloc(ar_ptr, bytes);
10 + victim = _int_malloc(ar_ptr, bytes);
11 #endif
12 }
13 }
14 @@ -3968,8 +3967,7 @@ public_mEMALIGn(size_t alignment, size_t
15 mstate prev = ar_ptr->next ? ar_ptr : 0;
16 (void)mutex_unlock(&ar_ptr->mutex);
17 ar_ptr = arena_get2(prev, bytes, true);
18 - if(ar_ptr)
19 - p = _int_memalign(ar_ptr, alignment, bytes);
20 + p = _int_memalign(ar_ptr, alignment, bytes);
21 #endif
22 }
23 }
24 @@ -4024,8 +4022,7 @@ public_vALLOc(size_t bytes)
25 mstate prev = ar_ptr->next ? ar_ptr : 0;
26 (void)mutex_unlock(&ar_ptr->mutex);
27 ar_ptr = arena_get2(prev, bytes, true);
28 - if(ar_ptr)
29 - p = _int_memalign(ar_ptr, pagesz, bytes);
30 + p = _int_memalign(ar_ptr, pagesz, bytes);
31 #endif
32 }
33 }
34 @@ -4080,8 +4077,7 @@ public_pVALLOc(size_t bytes)
35 mstate prev = ar_ptr->next ? ar_ptr : 0;
36 (void)mutex_unlock(&ar_ptr->mutex);
37 ar_ptr = arena_get2(prev, bytes + 2*pagesz + MINSIZE, true);
38 - if(ar_ptr)
39 - p = _int_memalign(ar_ptr, pagesz, rounded_bytes);
40 + p = _int_memalign(ar_ptr, pagesz, rounded_bytes);
41 #endif
42 }
43 }
44 @@ -4180,11 +4176,9 @@ public_cALLOc(size_t n, size_t elem_size
45 mstate prev = av->next ? av : 0;
46 (void)mutex_unlock(&av->mutex);
47 av = arena_get2(prev, sz, true);
48 - if(av)
49 - mem = _int_malloc(av, sz);
50 + mem = _int_malloc(av, sz);
51 #endif
52 }
53 - if (mem == 0) return 0;
54 }
55
56 if (av != NULL)