← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde-runtime/precise-updates

« back to all changes in this revision

Viewing changes to plasma/declarativeimports/plasmacomponents/qml/ToolBar.qml

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2014-11-20 15:46:42 UTC
  • mfrom: (18.1.5 precise-proposed)
  • Revision ID: package-import@ubuntu.com-20141120154642-hyesdbuvsk78ihtz
Tags: 4:4.8.5-0ubuntu0.3
https://launchpad.net/bugs/1393479
* SECURITY UPDATE: Insufficient Input Validation By IO Slaves and
  Webkit Part
 - Add upstream_CVE-2014-8600.diff to escape protocol twice: once
   for i18n, and once for HTML
 - https://www.kde.org/info/security/advisory-20141113-1.txt
 - CVE-2014-8600
 - LP: #1393479

Show diffs side-by-side

added added

removed removed

Lines of Context:
plasma/declarativeimports/plasmacomponents/qml/ToolBar.qml
67
67
    //      replace     follows page stack replace animation
68
68
    property string transition: "set"
69
69
 
 
70
    //This invisible item keeps all the old dismissed tools:
 
71
    //note that the outside application still has to keep references to them (or explicity delete them) or they will just accumulate wasting memory
 
72
    Item {
 
73
        id: oldToolsItem
 
74
        visible: false
 
75
    }
70
76
    // Sets the tools with a transition.
71
77
    function setTools(tools, transition)
72
78
    {
74
80
            return
75
81
        }
76
82
 
 
83
        if (connection.oldTools) {
 
84
            connection.oldTools.parent = oldToolsItem
 
85
        }
 
86
        connection.oldTools = toolBar.tools
77
87
        toolBar.transition = transition
78
88
        toolBar.tools = tools
79
89
    }
80
90
    Connections {
81
91
        id: connection
82
92
        target: toolBar
 
93
        property Item oldTools
 
94
 
83
95
        function internalToolsChanged()
84
96
        {
85
97
            var newContainer