← Back to branch summary

~ubuntu-branches/ubuntu/raring/gtkglext/raring

« back to all changes in this revision

Viewing changes to debian/patches/01_fix_fontcache_nullderef.diff

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2011-10-18 23:28:01 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111018232801-xk8ouag7irr32cmj
Tags: 1.2.0-2fakesync1
Fake sync due to mismatching orig tarball.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_fix_fontcache_nullderef.diff
 
1
by A Mennucc <mennucc1@debian.org>.
 
2
Fixes NULL dereference in gdkglfont-x11.c.
 
3
 
 
4
--- gtkglext-1.0.6/gdk/x11/gdkglfont-x11.c      2004-02-20 10:56:23.000000000 +0100
 
5
+++ gtkglext-1.0.6.mine/gdk/x11/gdkglfont-x11.c 2006-05-12 11:40:11.416117472 +0200
 
6
@@ -111,6 +111,12 @@
 
7
 
 
8
   fs = pango_x_font_cache_load (font_cache, xlfd);
 
9
 
 
10
+  if( fs == NULL) {
 
11
+    g_warning ("cannot get X font cache");
 
12
+    font = NULL;
 
13
+    goto FAIL;
 
14
+  }
 
15
+
 
16
   glXUseXFont (fs->fid, first, count, list_base);
 
17
 
 
18
   pango_x_font_cache_unload (font_cache, fs);