diff options
author | Owen Taylor <otaylor@redhat.com> | 2004-02-10 19:25:55 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2004-02-10 19:25:55 +0000 |
commit | 6c518ebcdeae62bb7726a891b798cf1cd72e6bec (patch) | |
tree | 69ef6284747a53700c75fccd0a2061afcce38236 | |
parent | 575835ba425ccd571b4283f6c463591a529e8bf9 (diff) | |
download | pango-6c518ebcdeae62bb7726a891b798cf1cd72e6bec.tar.gz |
Fix the amount of memory being allocated. (#132994, Torsten Schoenfeld)
Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com>
* pango/pango-tabs.c (pango_tab_array_resize): Fix
the amount of memory being allocated. (#132994,
Torsten Schoenfeld)
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 12 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 12 | ||||
-rw-r--r-- | pango/pango-tabs.c | 4 |
6 files changed, 62 insertions, 2 deletions
@@ -1,3 +1,15 @@ +Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-tabs.c (pango_tab_array_resize): Fix + the amount of memory being allocated. (#132994, + Torsten Schoenfeld) + +Mon Feb 9 09:52:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-attributes.c (pango_attr_iterator_next): Fix + infinite loop introduced with last change. (#133749, + reported by Mariano Suárez-Alvarez) + Thu Feb 5 16:30:46 2004 Owen Taylor <otaylor@redhat.com> Fix problem with empty markup tags (#128102, Christian Persch) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 004ddbe9..a6ba35aa 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,15 @@ +Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-tabs.c (pango_tab_array_resize): Fix + the amount of memory being allocated. (#132994, + Torsten Schoenfeld) + +Mon Feb 9 09:52:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-attributes.c (pango_attr_iterator_next): Fix + infinite loop introduced with last change. (#133749, + reported by Mariano Suárez-Alvarez) + Thu Feb 5 16:30:46 2004 Owen Taylor <otaylor@redhat.com> Fix problem with empty markup tags (#128102, Christian Persch) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 004ddbe9..a6ba35aa 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,15 @@ +Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-tabs.c (pango_tab_array_resize): Fix + the amount of memory being allocated. (#132994, + Torsten Schoenfeld) + +Mon Feb 9 09:52:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-attributes.c (pango_attr_iterator_next): Fix + infinite loop introduced with last change. (#133749, + reported by Mariano Suárez-Alvarez) + Thu Feb 5 16:30:46 2004 Owen Taylor <otaylor@redhat.com> Fix problem with empty markup tags (#128102, Christian Persch) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 004ddbe9..a6ba35aa 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,15 @@ +Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-tabs.c (pango_tab_array_resize): Fix + the amount of memory being allocated. (#132994, + Torsten Schoenfeld) + +Mon Feb 9 09:52:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-attributes.c (pango_attr_iterator_next): Fix + infinite loop introduced with last change. (#133749, + reported by Mariano Suárez-Alvarez) + Thu Feb 5 16:30:46 2004 Owen Taylor <otaylor@redhat.com> Fix problem with empty markup tags (#128102, Christian Persch) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 004ddbe9..a6ba35aa 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,15 @@ +Tue Feb 10 14:13:04 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-tabs.c (pango_tab_array_resize): Fix + the amount of memory being allocated. (#132994, + Torsten Schoenfeld) + +Mon Feb 9 09:52:24 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-attributes.c (pango_attr_iterator_next): Fix + infinite loop introduced with last change. (#133749, + reported by Mariano Suárez-Alvarez) + Thu Feb 5 16:30:46 2004 Owen Taylor <otaylor@redhat.com> Fix problem with empty markup tags (#128102, Christian Persch) diff --git a/pango/pango-tabs.c b/pango/pango-tabs.c index 7aafb22a..09eeefb8 100644 --- a/pango/pango-tabs.c +++ b/pango/pango-tabs.c @@ -242,8 +242,8 @@ pango_tab_array_resize (PangoTabArray *tab_array, while (new_size > tab_array->allocated) tab_array->allocated = tab_array->allocated * 2; - tab_array->tabs = g_realloc (tab_array->tabs, - tab_array->allocated); + tab_array->tabs = g_renew (PangoTab, tab_array->tabs, + tab_array->allocated); init_tabs (tab_array, current_end, tab_array->allocated); } |