Amebis/cld2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use delete[] instead of delete for array types.

Browse Source 
For more information, see issue 14:
https://code.google.com/p/cld2/issues/detail?id=14



git-svn-id: https://cld2.googlecode.com/svn/trunk@161 b252ecd4-b096-bf77-eb8e-91563289f87e
This commit is contained in:
andrewhayden@google.com
2014-05-16 10:31:11 +00:00
parent 3fced38754
commit d076f5eda2
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/cld2_dynamic_data_loader.cc
View File

@@ -1,4 +1,3 @@
// Copyright 2014 Google Inc. All Rights Reserved.
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
@@ -117,7 +116,7 @@ CLD2DynamicData::FileHeader* loadInternal(FILE* inFile, const void* basePointer,
if (expectedHeaderSize != bytesRead) { if (expectedHeaderSize != bytesRead) {
std::cerr << "Header size mismatch! Expected " << expectedHeaderSize << ", but read " << bytesRead << std::endl; std::cerr << "Header size mismatch! Expected " << expectedHeaderSize << ", but read " << bytesRead << std::endl;
delete header; delete header;
delete tableHeaders; delete[] tableHeaders;
return NULL; return NULL;
} }
@@ -134,7 +133,7 @@ CLD2DynamicData::FileHeader* loadInternal(FILE* inFile, const void* basePointer,
if (actualSize != header->totalFileSizeBytes) { if (actualSize != header->totalFileSizeBytes) {
std::cerr << "File size mismatch! Expected " << header->totalFileSizeBytes << ", but found " << actualSize << std::endl; std::cerr << "File size mismatch! Expected " << header->totalFileSizeBytes << ", but found " << actualSize << std::endl;
delete header; delete header;
delete tableHeaders; delete[] tableHeaders;
return NULL; return NULL;
} }
return header; return header;
@@ -253,7 +252,7 @@ CLD2::ScoringTables* loadDataInternal(CLD2DynamicData::FileHeader* header, const
result->deltaocta_obj = &tableSummaries[5]; result->deltaocta_obj = &tableSummaries[5];
result->distinctocta_obj = &tableSummaries[6]; result->distinctocta_obj = &tableSummaries[6];
result->kExpectedScore = read_kAvgDeltaOctaScore; result->kExpectedScore = read_kAvgDeltaOctaScore;
delete header->tableHeaders; delete[] header->tableHeaders;
delete header; delete header;
return result; return result;
} }

2
internal/cld2_dynamic_data_tool.cc
View File

@@ -156,7 +156,7 @@ Usage:\n\
return -1; return -1;
} }
CLD2DynamicData::dumpHeader(header); CLD2DynamicData::dumpHeader(header);
delete header->tableHeaders; delete[] header->tableHeaders;
delete header; delete header;
} }