1 |
From d2c37d028d48337d00200248340de0e4a893456b Mon Sep 17 00:00:00 2001 |
From d2c37d028d48337d00200248340de0e4a893456b Mon Sep 17 00:00:00 2001 |
2 |
From: Tim Lammens <tim.lammens@gmail.com> |
From: Tim Lammens <tim.lammens@gmail.com> |
3 |
Date: Thu, 11 Sep 2014 10:35:54 +0530 |
Date: Thu, 11 Sep 2014 10:35:54 +0530 |
4 |
Subject: [PATCH] Fix memory leak in libio/wfileops.c do_ftell_wide [BZ #17370] |
Subject: [PATCH 05/18] Fix memory leak in libio/wfileops.c do_ftell_wide [BZ |
5 |
|
#17370] |
6 |
|
|
7 |
(cherry picked from commit 984c0ea97f649c869130a1ff099098e2b6f70aad) |
(cherry picked from commit 984c0ea97f649c869130a1ff099098e2b6f70aad) |
8 |
|
|
9 |
Conflicts: |
Conflicts: |
10 |
NEWS |
NEWS |
11 |
--- |
--- |
12 |
ChangeLog | 5 +++++ |
ChangeLog | 5 +++++ |
13 |
NEWS | 2 +- |
NEWS | 2 +- |
14 |
libio/wfileops.c | 1 + |
libio/wfileops.c | 1 + |
15 |
3 files changed, 7 insertions(+), 1 deletions(-) |
3 files changed, 7 insertions(+), 1 deletion(-) |
16 |
|
|
17 |
#diff --git a/ChangeLog b/ChangeLog |
diff --git a/ChangeLog b/ChangeLog |
18 |
#index f456c1a..9ebf81e 100644 |
index f456c1a..9ebf81e 100644 |
19 |
#--- a/ChangeLog |
--- a/ChangeLog |
20 |
#+++ b/ChangeLog |
+++ b/ChangeLog |
21 |
#@@ -1,3 +1,8 @@ |
@@ -1,3 +1,8 @@ |
22 |
#+2014-09-11 Tim Lammens <tim.lammens@gmail.com> |
+2014-09-11 Tim Lammens <tim.lammens@gmail.com> |
23 |
#+ |
+ |
24 |
#+ [BZ #17370] |
+ [BZ #17370] |
25 |
#+ * libio/wfileops (do_ftell_wide): Free OUT. |
+ * libio/wfileops (do_ftell_wide): Free OUT. |
26 |
#+ |
+ |
27 |
# 2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com> |
2014-09-16 Siddhesh Poyarekar <siddhesh@redhat.com> |
28 |
# Jakub Jelinek <jakub@redhat.com> |
Jakub Jelinek <jakub@redhat.com> |
29 |
# |
|
30 |
#diff --git a/NEWS b/NEWS |
diff --git a/NEWS b/NEWS |
31 |
#index a9991cc..c555f75 100644 |
index a9991cc..c555f75 100644 |
32 |
#--- a/NEWS |
--- a/NEWS |
33 |
#+++ b/NEWS |
+++ b/NEWS |
34 |
#@@ -9,7 +9,7 @@ Version 2.20.1 |
@@ -9,7 +9,7 @@ Version 2.20.1 |
35 |
# |
|
36 |
# * The following bugs are resolved with this release: |
* The following bugs are resolved with this release: |
37 |
# |
|
38 |
#- 17266, 17371. |
- 17266, 17371. |
39 |
#+ 17266, 17370, 17371. |
+ 17266, 17370, 17371. |
40 |
|
|
41 |
# Version 2.20 |
Version 2.20 |
42 |
# |
|
43 |
diff --git a/libio/wfileops.c b/libio/wfileops.c |
diff --git a/libio/wfileops.c b/libio/wfileops.c |
44 |
index f123add..ebc06e8 100644 |
index f123add..ebc06e8 100644 |
45 |
--- a/libio/wfileops.c |
--- a/libio/wfileops.c |
53 |
|
|
54 |
/* We don't trust _IO_read_end to represent the current file offset |
/* We don't trust _IO_read_end to represent the current file offset |
55 |
-- |
-- |
56 |
1.7.1 |
2.3.0 |
57 |
|
|