Repository: hadoop Updated Branches: refs/heads/trunk 286cc6483 -> fc7cd46fa
MAPREDUCE-3914. Mismatched free() / delete / delete [] in HadoopPipes (Joe Mudd via aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fc7cd46f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fc7cd46f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fc7cd46f Branch: refs/heads/trunk Commit: fc7cd46faf5cafc73d4316a21d59cb2b83a6b48f Parents: 286cc64 Author: Allen Wittenauer <a...@apache.org> Authored: Thu Nov 5 16:50:55 2015 -0800 Committer: Allen Wittenauer <a...@apache.org> Committed: Thu Nov 5 16:53:32 2015 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 4 ++++ .../hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc7cd46f/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f30f0ef..938509a 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -120,6 +120,7 @@ Trunk (Unreleased) BUG FIXES + MAPREDUCE-6191. Improve clearing stale state of Java serialization testcase. (Sam Liu via Eric Yang) @@ -168,6 +169,9 @@ Trunk (Unreleased) MAPREDUCE-4695. Fix LocalRunner on trunk after MAPREDUCE-3223 broke it (harsh) + MAPREDUCE-3914. Mismatched free() / delete / delete [] in HadoopPipes + (Joe Mudd via aw) + MAPREDUCE-4574. Fix TotalOrderParitioner to work with non-WritableComparable key types. (harsh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/fc7cd46f/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc b/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc index 64c8454..91fb5a4 100644 --- a/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc +++ b/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc @@ -1169,8 +1169,8 @@ namespace HadoopPipes { if (outStream != NULL) { //fclose(outStream); } - delete bufin; - delete bufout; + delete[] bufin; + delete[] bufout; return true; } catch (Error& err) { fprintf(stderr, "Hadoop Pipes Exception: %s\n",
