Merge pull request livecode#7553 from livecodeian/bugfix-23168

livecodepanos · web-flow · commit d5e9cbcdc759 · 2021-06-30T11:30:15.000+03:00
[[ Bug 23168 ]] Fix memory leak when rendering "good" quality gradients
diff --git a/docs/notes/bugfix-23168.md b/docs/notes/bugfix-23168.md
@@ -0,0 +1 @@
+# Fix memory leak when rendering gradients where the quality is set to "good"
diff --git a/libgraphics/src/legacygradients.cpp b/libgraphics/src/legacygradients.cpp
@@ -315,12 +315,13 @@ class MCGGeneralizedGradientShader : public SkShader
             m_buffer = nullptr;
             m_buffer_width = 0;
         }
-        
-        ~Context()
-        {
-            MCMemoryDeleteArray(m_ramp);
-        }
-        
+
+		~Context()
+		{
+			MCMemoryDeleteArray(m_buffer);
+			MCMemoryDeleteArray(m_ramp);
+		}
+
         virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) override
         {
             if (m_combine == nullptr)
@@ -339,7 +340,7 @@ class MCGGeneralizedGradientShader : public SkShader
             {
                 if ((int)m_buffer_width < count * GRADIENT_AA_SCALE)
                 {
-                    uindex_t t_size = m_buffer_width * GRADIENT_AA_SCALE * GRADIENT_AA_SCALE;
+                    uindex_t t_size = m_buffer_width * GRADIENT_AA_SCALE;
                     if (!MCMemoryResizeArray(count * GRADIENT_AA_SCALE * GRADIENT_AA_SCALE, m_buffer, t_size))
                     {
                         return;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix memory leak when rendering gradients where the quality is set to "good"`
Original file line number	Diff line number	Diff line change
`@@ -315,12 +315,13 @@ class MCGGeneralizedGradientShader : public SkShader`
`315`	`315`	`m_buffer = nullptr;`
`316`	`316`	`m_buffer_width = 0;`
`317`	`317`	`}`
`318`		`-`
`319`		`- ~Context()`
`320`		`- {`
`321`		`- MCMemoryDeleteArray(m_ramp);`
`322`		`- }`
`323`		`-`
	`318`	`+`
	`319`	`+ ~Context()`
	`320`	`+ {`
	`321`	`+ MCMemoryDeleteArray(m_buffer);`
	`322`	`+ MCMemoryDeleteArray(m_ramp);`
	`323`	`+ }`
	`324`	`+`
`324`	`325`	`virtual void shadeSpan(int x, int y, SkPMColor dstC[], int count) override`
`325`	`326`	`{`
`326`	`327`	`if (m_combine == nullptr)`
`@@ -339,7 +340,7 @@ class MCGGeneralizedGradientShader : public SkShader`
`339`	`340`	`{`
`340`	`341`	`if ((int)m_buffer_width < count * GRADIENT_AA_SCALE)`
`341`	`342`	`{`
`342`		`- uindex_t t_size = m_buffer_width * GRADIENT_AA_SCALE * GRADIENT_AA_SCALE;`
	`343`	`+ uindex_t t_size = m_buffer_width * GRADIENT_AA_SCALE;`
`343`	`344`	`if (!MCMemoryResizeArray(count * GRADIENT_AA_SCALE * GRADIENT_AA_SCALE, m_buffer, t_size))`
`344`	`345`	`{`
`345`	`346`	`return;`