Merge pull request #1269 from assimp/issue_1266
closes https://github.com/assimp/assimp/issues/1266: fix wrong deletepull/1274/head
commit
7e011c92f0
|
@ -306,7 +306,7 @@ bool RemoveVCProcess::ProcessMesh(aiMesh* pMesh)
|
|||
if (!pMesh->mColors[i])break;
|
||||
if (configDeleteFlags & aiComponent_COLORSn(i) || b)
|
||||
{
|
||||
delete pMesh->mColors[i];
|
||||
delete [] pMesh->mColors[i];
|
||||
pMesh->mColors[i] = NULL;
|
||||
ret = true;
|
||||
|
||||
|
|
|
@ -111,6 +111,7 @@ SET( TEST_SRCS
|
|||
unit/utRemoveComments.cpp
|
||||
unit/utRemoveComponent.cpp
|
||||
unit/utRemoveRedundantMaterials.cpp
|
||||
unit/utRemoveVCProcess.cpp
|
||||
unit/utScenePreprocessor.cpp
|
||||
unit/utSharedPPData.cpp
|
||||
unit/utStringUtils.cpp
|
||||
|
|
|
@ -0,0 +1,75 @@
|
|||
/*
|
||||
---------------------------------------------------------------------------
|
||||
Open Asset Import Library (assimp)
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
Copyright (c) 2006-2017, assimp team
|
||||
|
||||
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use of this software in source and binary forms,
|
||||
with or without modification, are permitted provided that the following
|
||||
conditions are met:
|
||||
|
||||
* Redistributions of source code must retain the above
|
||||
copyright notice, this list of conditions and the
|
||||
following disclaimer.
|
||||
|
||||
* Redistributions in binary form must reproduce the above
|
||||
copyright notice, this list of conditions and the
|
||||
following disclaimer in the documentation and/or other
|
||||
materials provided with the distribution.
|
||||
|
||||
* Neither the name of the assimp team, nor the names of its
|
||||
contributors may be used to endorse or promote products
|
||||
derived from this software without specific prior
|
||||
written permission of the assimp team.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
---------------------------------------------------------------------------
|
||||
*/
|
||||
#include "UnitTestPCH.h"
|
||||
#include "code/RemoveVCProcess.h"
|
||||
#include <assimp/mesh.h>
|
||||
#include <assimp/scene.h>
|
||||
|
||||
using namespace ::Assimp;
|
||||
|
||||
class utRevmoveVCProcess : public ::testing::Test {
|
||||
// empty
|
||||
};
|
||||
|
||||
TEST_F( utRevmoveVCProcess, createTest ) {
|
||||
bool ok = true;
|
||||
try {
|
||||
RemoveVCProcess *process = new RemoveVCProcess;
|
||||
delete process;
|
||||
} catch ( ... ) {
|
||||
ok = false;
|
||||
}
|
||||
EXPECT_TRUE( ok );
|
||||
}
|
||||
|
||||
TEST_F( utRevmoveVCProcess, issue1266_ProcessMeshTest_NoCrash ) {
|
||||
aiScene *scene = new aiScene;
|
||||
scene->mNumMeshes = 1;
|
||||
scene->mMeshes = new aiMesh*[ 1 ];
|
||||
|
||||
aiMesh *mesh = new aiMesh;
|
||||
mesh->mNumVertices = 1;
|
||||
mesh->mColors[ 0 ] = new aiColor4D[ 2 ];
|
||||
scene->mMeshes[ 0 ] = mesh;
|
||||
RemoveVCProcess *process = new RemoveVCProcess;
|
||||
process->Execute( scene );
|
||||
}
|
Loading…
Reference in New Issue