am 1efe46de: Merge "Fix id3 parser crash"

* commit '1efe46deb86b8ca246e2486ec16d88efd9e1e657':
  Fix id3 parser crash