Nux

Merge lp:~vanvugt/nux/fix-785118 into lp:nux

  1. fix-785118
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 476
Proposed branch: lp:~vanvugt/nux/fix-785118
Merge into: lp:nux
Diff against target: 12 lines (+1/-1)
1 file modified
NuxGraphics/IOpenGLGLSLShader.cpp (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/nux/fix-785118
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+76151@code.launchpad.net

Description of the change

Fix mismatched new[]/delete calls. (LP: #785118)

Since I first logged this bug, most of the problems have been fixed upstream. Now only one remains...

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) wrote :

Approved. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'NuxGraphics/IOpenGLGLSLShader.cpp'
--- NuxGraphics/IOpenGLGLSLShader.cpp 2011-09-16 18:08:15 +0000
+++ NuxGraphics/IOpenGLGLSLShader.cpp 2011-09-20 06:09:25 +0000
@@ -596,7 +596,7 @@
596596
597 if (NumAttachedShaders)597 if (NumAttachedShaders)
598 {598 {
599 delete ShaderObjects;599 delete[] ShaderObjects;
600 }600 }
601601
602 for (int i = 0; i < (int) ShaderObjectList.size(); i++)602 for (int i = 0; i < (int) ShaderObjectList.size(); i++)

Subscribers

People subscribed via source and target branches