oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/ApeLoader: use std::unique_ptr

Browse Source
This commit is contained in:
Max Kellermann 2016-02-22 17:50:15 +01:00
parent a5f8fd774d
commit 1f5b9c6185
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tag/ApeLoader.cxx
View File

@ -28,6 +28,8 @@
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include <memory>
#include <stdint.h> #include <stdint.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
@ -69,15 +71,13 @@ tag_ape_scan(InputStream &is, ApeTagCallback callback)
remaining -= sizeof(footer); remaining -= sizeof(footer);
assert(remaining > 10); assert(remaining > 10);
char *buffer = new char[remaining]; std::unique_ptr<char[]> buffer(new char[remaining]);
if (!is.ReadFull(buffer, remaining, IgnoreError())) { if (!is.ReadFull(buffer.get(), remaining, IgnoreError()))
delete[] buffer;
return false; return false;
}
/* read tags */ /* read tags */
unsigned n = FromLE32(footer.count); unsigned n = FromLE32(footer.count);
const char *p = buffer; const char *p = buffer.get();
while (n-- && remaining > 10) { while (n-- && remaining > 10) {
size_t size = FromLE32(*(const uint32_t *)p); size_t size = FromLE32(*(const uint32_t *)p);
p += 4; p += 4;
@ -106,7 +106,6 @@ tag_ape_scan(InputStream &is, ApeTagCallback callback)
remaining -= size; remaining -= size;
} }
delete[] buffer;
return true; return true;
} }