Merge lp:~nabil-stendardo/ubuntu/quantal/compiz/fix-segfault-related-to-shaders-and-uniforms into lp:ubuntu/quantal/compiz

[NabilStendardo]

I fixed an annoying segfault (probably due to a typo) in plugins/opengl/src/vertexbuffer.cpp concerning functions third-party plugins would want to use (one such plugin/revision is <https://github.com/gebner/compiz-cms/tree/e6ebd9ae76c87069527004f1b4e9190d90f1c59a)>.

The fix was trivial (found "program" where it clearly should have been "tmpProgram").

[Daniel van Vugt (vanvugt)]

Thanks Nabil. Please propose to branch "lp:compiz" instead.

And no changes to debian/changelog for now thanks.

review: Resubmit

[Daniel van Vugt (vanvugt)]

Please also log a bug for the crash in Launchpad and make sure your branch is linked to it.

[Didier Roche (didrocks)]

Thanks a lot for your patch!

The best way to deal with this one is to get upstream in touch and proposing the fix directly to them, they will review it (seems a trivial typo, indeed). I just pinged duflu on IRC and he will give you more instruction (proposing something against lp:compiz) :)

We will then backport it.

Thanks again ;)

Unmerged revisions

3320. By NabilStendardo on 2012-10-21

* Fixed segfault in plugins/opengl/src/vertexbuffer.cpp.
  - It concerns third-party plugins using the compiz opengl API.
  - The crash occurs during rendering after shaders are added using GLWindow.addShaders and
  after a Uniform is manually added to the vertex buffer.

3319. By Didier Roche on 2012-10-17

releasing version 1:0.9.8.4+bzr3407-0ubuntu1

3318. By Timo Jyrinki on 2012-10-12

* New upstream snapshot.
  - Cherry-picked fixes in Ubuntu merged to development branch
  - Disable failing tests due to distro patch (LP: #1058577)
  - Fix leakage of destroyed_pixmaps_table, containing pointers to freed
    decor_t's which could result in a freed GHashTable being passed into
    g_hash_table_remove and causing a crash. (LP: #1060171)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-17 06:06:09 +0000
+++ debian/changelog	2012-10-21 18:59:21 +0000
@@ -1,3 +1,12 @@
+compiz (1:0.9.8.4+bzr3407-0ubuntu2) UNRELEASED; urgency=low
+
+  * Fixed segfault in plugins/opengl/src/vertexbuffer.cpp. 
+    - It concerns third-party plugins using the compiz opengl API.
+    - The crash occurs during rendering after shaders are added using GLWindow.addShaders and
+    after a Uniform is manually added to the vertex buffer.
+
+ -- Nabil Stendardo <[e-mail]>  Sun, 21 Oct 2012 20:42:01 +0200
+
 compiz (1:0.9.8.4+bzr3407-0ubuntu1) quantal-proposed; urgency=low
 
   * New upstream snapshot.

=== modified file 'plugins/opengl/src/vertexbuffer.cpp'
--- plugins/opengl/src/vertexbuffer.cpp	2012-09-05 23:54:21 +0000
+++ plugins/opengl/src/vertexbuffer.cpp	2012-10-21 18:59:21 +0000
@@ -522,7 +522,7 @@
     // set per-plugin uniforms
     for (unsigned int i = 0; i < uniforms.size (); i++)
     {
-	uniforms[i]->set (program);
+	uniforms[i]->set (tmpProgram);
     }
 
     //convert paint attribs to 0-1 range