mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-19 13:34:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Unicode property keys in C bindings

Browse Source 
The C bindings would convert a char* to String using the default
constructor, which uses the Latin1 encoding, breaking when a key
contains a Unicode character (e.g. an ID3v2 comment description).
This commit is contained in:
norma
2025-07-03 13:53:31 +02:00
committed by Urs Fleisch
parent 7d86716194
commit e831f0929f
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bindings/c/tag_c.cpp
View File

@ -469,12 +469,13 @@ void _taglib_property_set(TagLib_File *file, const char* prop, const char* value
return;
auto tfile = reinterpret_cast<FileRef *>(file);
auto propStr = charArrayToString(prop);
PropertyMap map = tfile->tag()->properties();
if(value) {
auto property = map.find(prop);
auto property = map.find(propStr);
if(property == map.end()) {
map.insert(prop, StringList(charArrayToString(value)));
map.insert(propStr, StringList(charArrayToString(value)));
}
else {
if(append) {
@ -486,7 +487,7 @@ void _taglib_property_set(TagLib_File *file, const char* prop, const char* value
}
}
else {
map.erase(prop);
map.erase(propStr);
}
tfile->setProperties(map);
@ -531,7 +532,7 @@ char **taglib_property_get(const TagLib_File *file, const char *prop)
const PropertyMap map = reinterpret_cast<const FileRef *>(file)->properties();
auto property = map.find(prop);
auto property = map.find(charArrayToString(prop));
if(property == map.end())
return NULL;
@ -573,16 +574,17 @@ bool _taglib_complex_property_set(
return false;
auto tfile = reinterpret_cast<FileRef *>(file);
auto keyStr = charArrayToString(key);
if(value == NULL) {
return tfile->setComplexProperties(key, {});
return tfile->setComplexProperties(keyStr, {});
}
VariantMap map;
const TagLib_Complex_Property_Attribute** attrPtr = value;
while(*attrPtr) {
const TagLib_Complex_Property_Attribute *attr = *attrPtr;
String attrKey(attr->key);
auto attrKey = charArrayToString(attr->key);
switch(attr->value.type) {
case TagLib_Variant_Void:
map.insert(attrKey, Variant());
@ -627,8 +629,8 @@ bool _taglib_complex_property_set(
++attrPtr;
}
return append ? tfile->setComplexProperties(key, tfile->complexProperties(key).append(map))
: tfile->setComplexProperties(key, {map});
return append ? tfile->setComplexProperties(keyStr, tfile->complexProperties(keyStr).append(map))
: tfile->setComplexProperties(keyStr, {map});
}
} // namespace
@ -676,7 +678,7 @@ TagLib_Complex_Property_Attribute*** taglib_complex_property_get(
return NULL;
}
const auto variantMaps = reinterpret_cast<const FileRef *>(file)->complexProperties(key);
const auto variantMaps = reinterpret_cast<const FileRef *>(file)->complexProperties(charArrayToString(key));
if(variantMaps.isEmpty()) {
return NULL;
}