Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (fc3e6d9b88ba7d16d8358aea89f0e619474f91e8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (fc3e6d9b88ba7d16d8358aea89f0e619474f91e8)
  • Date: Wed, 28 Sep 2016 00:05:53 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

xorg-lib/libx11/HISTORY
| 4 +
xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
| 35 ----------
2 files changed, 4 insertions(+), 35 deletions(-)

New commits:
commit fc3e6d9b88ba7d16d8358aea89f0e619474f91e8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libx11: Remove segfault patch (bug not present with GCC 6.2)

diff --git a/xorg-lib/libx11/HISTORY b/xorg-lib/libx11/HISTORY
index e8ba2bb..f10587f 100644
--- a/xorg-lib/libx11/HISTORY
+++ b/xorg-lib/libx11/HISTORY
@@ -1,3 +1,7 @@
+2016-09-27 Ismael Luceno <ismael AT sourcemage.org>
+ * omGeneric-Fix-segfault-in-set_fontset_extents.patch: Removed, not
+ needed anymore (the bug isn't present with GCC 6.2.0)
+
2016-08-14 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Use apply_patch_dir

diff --git
a/xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
b/xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
deleted file mode 100644
index ff3f612..0000000
---
a/xorg-lib/libx11/patches/omGeneric-Fix-segfault-in-set_fontset_extents.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b3a5ece29ffcce6effb6d5765d8ccf8609aa2d1c Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Wed, 15 Jul 2015 00:56:00 -0300
-Subject: [PATCH] omGeneric: Fix NULL pointer dereferences in
- set_fontset_extents
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- modules/om/generic/omGeneric.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c
-index a835f00..f0861e8 100644
---- a/modules/om/generic/omGeneric.c
-+++ b/modules/om/generic/omGeneric.c
-@@ -398,7 +398,7 @@ set_fontset_extents(
- font_data = font_set->vmap;
- font_data_count = font_set->vmap_num;
- for( ; font_data_count-- ; font_data++) {
-- if(font_data->font != NULL) {
-+ if(font_data && font_data->font) {
- check_fontset_extents(&overall, &logical_ascent,
- &logical_descent,
- font_data->font);
-@@ -410,7 +410,7 @@ set_fontset_extents(
- font_data = (FontData) font_set->vrotate;
- font_data_count = font_set->vrotate_num;
- for( ; font_data_count-- ; font_data++) {
-- if(font_data->font != NULL) {
-+ if(font_data && font_data->font) {
- check_fontset_extents(&overall, &logical_ascent,
- &logical_descent,
- font_data->font);
---
-2.4.5



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (fc3e6d9b88ba7d16d8358aea89f0e619474f91e8), Ismael Luceno, 09/27/2016

Archive powered by MHonArc 2.6.24.

Top of Page