[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1858-gf84af61

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  f84af61ed7e98e50bf077299a42cb7d70b83f0c5 (commit)
      from  a3180f2a679c9724d1ca954d63224063defb5ff5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=f84af61ed7e98e50bf077299a42cb7d70b83f0c5


commit f84af61ed7e98e50bf077299a42cb7d70b83f0c5
Author: Bastiaan Jacques <address@hidden>
Date:   Fri Apr 18 02:24:02 2014 +0200

    Savannah #40315: make sure (line) style references in dynamic shapes are 
always valid. Add a test.

diff --git a/libcore/DynamicShape.cpp b/libcore/DynamicShape.cpp
index 10bc3cb..0103b60 100644
--- a/libcore/DynamicShape.cpp
+++ b/libcore/DynamicShape.cpp
@@ -152,7 +152,7 @@ DynamicShape::finalize() const
        // This function being const seems to be at odds with its purpose...
        _shape.addSubshape(_currsubshape);
 
-       _currsubshape.clear();
+       _currsubshape.paths().clear(); // Retain style info
 
        // TODO: check consistency of fills and such !
 
diff --git a/testsuite/misc-ming.all/DrawingApiTest.as 
b/testsuite/misc-ming.all/DrawingApiTest.as
index e123a5b..b522112 100644
--- a/testsuite/misc-ming.all/DrawingApiTest.as
+++ b/testsuite/misc-ming.all/DrawingApiTest.as
@@ -287,6 +287,9 @@ a.onEnterFrame = function()
        }
        else
        {
+                // #40315: test that we don't crash without a line style.
+                this.b.lineTo(10, 20);
+
                this.b.clear();
                this.b.lineStyle(2, 0xFF0000);
                this.b.beginFill(0xFFFF00, 100);

-----------------------------------------------------------------------

Summary of changes:
 libcore/DynamicShape.cpp                  |    2 +-
 testsuite/misc-ming.all/DrawingApiTest.as |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash