Attachment 138433 Details for Bug 94776 – 0001-Check-if-streams-array-exists-in-handle_draw_jpeg_on.patch

[patch] 0001-Check-if-streams-array-exists-in-handle_draw_jpeg_on.patch

file_94776.txt (text/plain), 1.50 KB, created by Joel Purra on 2018-03-29 18:40:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joel Purra

Created: 2018-03-29 18:40:11 UTC

Size: 1.50 KB

patch

obsolete

>From b3dd9879786bfd9990d83b1d58581b94944cba14 Mon Sep 17 00:00:00 2001
>From: Joel Purra <mig@joelpurra.se>
>Date: Thu, 29 Mar 2018 20:00:51 +0200
>Subject: [PATCH 1/1] Check if streams array exists in handle_draw_jpeg_onload
>
>- It seems `SpiceDisplayConn` does not always have the array `this.o.sc.streams` set.
>- It also seems (stream?) images can be loaded before `streams` is set.
>- Without `streams`, or the specific stream matching `this.o.id`, `this.o.sc.streams[this.o.id].frames_loading` cannot be accessed.
>- The check for the specific stream woth `this.o.id` is already in place, this patch adds a check for `this.o.sc.streams` in `handle_draw_jpeg_onload`.
>- There might be a better place to ensure that `this.o.sc.streams` is initialized; this quick fix saved my bacon today though.
>
>Might be related to, and perhaps fix:
>
>- https://bugs.freedesktop.org/show_bug.cgi?id=94776
>- https://bugzilla.redhat.com/show_bug.cgi?id=1323144
>
>Signed-off-by: Joel Purra <mig@joelpurra.se>
>---
> display.js | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/display.js b/display.js
>index 7719b23..dbeffea 100644
>--- a/display.js
>+++ b/display.js
>@@ -883,7 +883,7 @@ function handle_draw_jpeg_onload()
>     var temp_canvas = null;
>     var context;
> 
>-    if (this.o.sc.streams[this.o.id])
>+    if ("streams" in this.o.sc && this.o.sc.streams[this.o.id])
>         this.o.sc.streams[this.o.id].frames_loading--;
> 
>     /*------------------------------------------------------------
>-- 
>2.16.2
>

Actions: View | Splinter Review

Attachments on bug 94776: 138433

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.