If a frame has both compression and encryption, since we currently

don't support encrypted frames, don't try to decompress it.  Decryption
is supposed to be applied before decompression, so currently the decompression
isn't possible.

BUG:112919

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@503234 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

diff --git a/mpeg/id3v2/id3v2frame.cpp b/mpeg/id3v2/id3v2frame.cpp
index f58e3500442f59117a19c6244cb769dee27fd7d4..fc090fef4095792418630785cfa5c1f4d52d5c0c 100644 (file)
--- a/mpeg/id3v2/id3v2frame.cpp
+++ b/mpeg/id3v2/id3v2frame.cpp
@@ -168,7 +168,9 @@ ByteVector Frame::fieldData(const ByteVector &frameData) const
   }
 
 #if HAVE_ZLIB
-  if(d->header->compression()) {
+  if(d->header->compression() &&
+     !d->header->encryption())
+  {
     ByteVector data(frameDataLength);
     uLongf uLongTmp = frameDataLength;
     ::uncompress((Bytef *) data.data(),