diff -Nru vdr-plugin-dvbapi-2.2.0-481~5fdb21e/debian/changelog vdr-plugin-dvbapi-2.2.0-483~0489e01/debian/changelog --- vdr-plugin-dvbapi-2.2.0-481~5fdb21e/debian/changelog 2015-05-01 22:27:59.000000000 +0000 +++ vdr-plugin-dvbapi-2.2.0-483~0489e01/debian/changelog 2015-05-18 11:52:24.000000000 +0000 @@ -1,31 +1,16 @@ -vdr-plugin-dvbapi (2.2.0-481~5fdb21e-vivid) vivid; urgency=medium +vdr-plugin-dvbapi (2.2.0-483~0489e01-vivid) vivid; urgency=medium - * [5fdb21ecac7415896879b7ce9c855e1f92a2d079] - Compile fix for c++11 issues + * [0489e0153ce26bfb92524d965c9a8985db69040a] + Filtering: better debug log - tested with gcc-4.8.4, gcc-4.9.2 - Signed-of-by: Joerg Bornkessel + * [4615326d33c1f38fcd9e7fe1af90c25a7853cd18] + Fix regression caused by 1f25321 + First chunk of data was wrongly counted based on full table lenght + instead of TS_SIZE. - * [85da7b20c96777de01dae3b7e62f6a3c015be259] - ECMINFO: add cardsystem name (OSCam rev 10653) - - Issue #91 - - - * [f5ae09a17003200009fe37a9a0848c43b6599667] - Add ECMINFO to service interface - - Closes #91 - - - * [6ac4bcda63b21ec47c7d97ab8c6adec332dc60b3] - Obtain ECMINFO data from OSCam (proto v2) - - - * [92039a4c202d82aa212179ea1dfa1293e12130cf] - cosmetics (indent) + Probably fixes #92 - -- Andrey Pavlenko Sat, 02 May 2015 01:27:59 +0300 + -- Andrey Pavlenko Mon, 18 May 2015 14:52:24 +0300 diff -Nru vdr-plugin-dvbapi-2.2.0-481~5fdb21e/Filter.cpp vdr-plugin-dvbapi-2.2.0-483~0489e01/Filter.cpp --- vdr-plugin-dvbapi-2.2.0-481~5fdb21e/Filter.cpp 2015-05-01 22:27:50.000000000 +0000 +++ vdr-plugin-dvbapi-2.2.0-483~0489e01/Filter.cpp 2015-05-18 11:52:13.000000000 +0000 @@ -177,14 +177,14 @@ } else //copying the first part of data { - DEBUGLOG("%s: saving first part of data", __FUNCTION__); + DEBUGLOG("%s: saving first part of data, tablelen=%d", __FUNCTION__, tablelen); if (it->data) delete it->data; it->data = new unsigned char[tablelen + 3]; it->len = tablelen; - memcpy(it->data, dat, tablelen + 3); //copy data - it->size = tablelen; + memcpy(it->data, dat, TS_SIZE - 5); //copy data + it->size = TS_SIZE - 5 - 3; it->lastcc = cc; } }