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

decoder/flac: VorbisComment_Entry is null-terminated

Browse Source 
Don't duplicate the buffer just to null-terminate the string.
According to libFLAC API documentation, the string is already
null-terminated.
This commit is contained in:
Max Kellermann 2013-12-14 13:26:02 +01:00
parent 635a67afac
commit 1da0526072
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/decoder/FlacMetadata.cxx
View File

@ -28,8 +28,6 @@
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/SplitString.hxx" #include "util/SplitString.hxx"
#include <glib.h>
#include <string.h> #include <string.h>
static bool static bool
@ -39,7 +37,7 @@ flac_find_float_comment(const FLAC__StreamMetadata *block,
int offset; int offset;
size_t pos; size_t pos;
int len; int len;
unsigned char tmp, *p; unsigned char *p;
offset = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0, offset = FLAC__metadata_object_vorbiscomment_find_entry_from(block, 0,
cmnt); cmnt);
@ -52,11 +50,7 @@ flac_find_float_comment(const FLAC__StreamMetadata *block,
return false; return false;
p = &block->data.vorbis_comment.comments[offset].entry[pos]; p = &block->data.vorbis_comment.comments[offset].entry[pos];
tmp = p[len];
p[len] = '\0';
*fl = (float)atof((char *)p); *fl = (float)atof((char *)p);
p[len] = tmp;
return true; return true;
} }
@ -117,21 +111,19 @@ flac_parse_mixramp(const FLAC__StreamMetadata *block)
/** /**
* Checks if the specified name matches the entry's name, and if yes, * Checks if the specified name matches the entry's name, and if yes,
* returns the comment value (not null-temrinated). * returns the comment value;
*/ */
static const char * static const char *
flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry, flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
const char *name, size_t *length_r) const char *name)
{ {
size_t name_length = strlen(name); size_t name_length = strlen(name);
const char *comment = (const char*)entry->entry; const char *comment = (const char*)entry->entry;
if (entry->length <= name_length || if (!StringEqualsCaseASCII(comment, name, name_length))
!StringEqualsCaseASCII(comment, name, name_length))
return nullptr; return nullptr;
if (comment[name_length] == '=') { if (comment[name_length] == '=') {
*length_r = entry->length - name_length - 1;
return comment + name_length + 1; return comment + name_length + 1;
} }
@ -147,14 +139,9 @@ flac_copy_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
const char *name, TagType tag_type, const char *name, TagType tag_type,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
const char *value; const char *value = flac_comment_value(entry, name);
size_t value_length;
value = flac_comment_value(entry, name, &value_length);
if (value != nullptr) { if (value != nullptr) {
char *p = g_strndup(value, value_length); tag_handler_invoke_tag(handler, handler_ctx, tag_type, value);
tag_handler_invoke_tag(handler, handler_ctx, tag_type, p);
g_free(p);
return true; return true;
} }