gfx/cairo/xlib-initialize-members.patch@97036ab72558 (annotated)
gfx/cairo/xlib-initialize-members.patch
Tue, 06 Jan 2015 21:39:09 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 06 Jan 2015 21:39:09 +0100
- branch
- TOR_BUG_9701
- changeset 8
- 97036ab72558
- permissions
- -rw-r--r--
Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.
| michael@0 | 1 | diff -r 059e9961a122 gfx/cairo/cairo/src/cairo-xlib-display.c |
| michael@0 | 2 | --- a/gfx/cairo/cairo/src/cairo-xlib-display.c Thu Feb 25 03:59:05 2010 -0800 |
| michael@0 | 3 | +++ b/gfx/cairo/cairo/src/cairo-xlib-display.c Fri Feb 26 16:15:29 2010 +0100 |
| michael@0 | 4 | @@ -259,7 +259,14 @@ |
| michael@0 | 5 | * add our hook. For now, that means Render, so we call into its |
| michael@0 | 6 | * QueryVersion function to ensure it gets initialized. |
| michael@0 | 7 | */ |
| michael@0 | 8 | - XRenderQueryVersion (dpy, &render_major, &render_minor); |
| michael@0 | 9 | + Status s = XRenderQueryVersion (dpy, &render_major, &render_minor); |
| michael@0 | 10 | + if (s == 0) { |
| michael@0 | 11 | + /* XRenderQueryVersion failed, possibly because the server |
| michael@0 | 12 | + * doesn't have the RENDER extension. Don't leave the version |
| michael@0 | 13 | + * numbers uninitialised. See #548793. |
| michael@0 | 14 | + */ |
| michael@0 | 15 | + render_major = render_minor = 0; |
| michael@0 | 16 | + } |
| michael@0 | 17 | |
| michael@0 | 18 | codes = XAddExtension (dpy); |
| michael@0 | 19 | if (unlikely (codes == NULL)) { |
