111888 2013-03-08 14:15:42 -0800 [GStreamer] Seeking related data corruption and broken offset handling in WebKitWebSrc 2013-03-10 11:00:43 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Major --- 1 slomo webkit-unassigned gustavo menard mrobinson pnormand webkit.review.bot oldest_to_newest 851500 0 slomo 2013-03-08 14:15:42 -0800 Hi, there's potential seeking related data corruption in WebKitWebSrc, see this gst-plugins-good commit for an explanation: http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/ext/soup/gstsouphttpsrc.c?id=95f6e0dbe440cc0399a54221d672f11e4e1d6ee8 The code in WebKitWebSrc is doing basically the same and attached patch fixes it in the same way 851573 1 192298 slomo 2013-03-08 15:42:22 -0800 Created attachment 192298 Fix offset handling in GStreamer WebKitWebSource Also the offset handling was completely broken after a seek (offsets were starting at 0 again instead of the seek position), this patch fixes it now. 851590 2 192301 slomo 2013-03-08 16:05:03 -0800 Created attachment 192301 Fix offset handling in GStreamer WebKitWebSource 851741 3 slomo 2013-03-09 00:37:40 -0800 I should mention that this also causes these warnings in the GStreamer debug logs: 0:00:00.799966750 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 0 != 99761158 0:00:00.814100750 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 11154 != 99772312 0:00:00.818346833 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 14050 != 99775208 0:00:00.827516708 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 32874 != 99794032 0:00:00.835650083 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 35770 != 99796928 0:00:00.851485041 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 40114 != 99801272 0:00:00.856966208 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 48802 != 99809960 0:00:00.867456083 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 51698 != 99812856 0:00:00.871585125 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 57490 != 99818648 0:00:00.874578917 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 76314 != 99837472 0:00:00.877421333 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 77762 != 99838920 0:00:00.882384875 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 82106 != 99843264 0:00:00.885572791 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 86450 != 99847608 0:00:00.886786250 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 89346 != 99850504 0:00:00.888003333 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 92242 != 99853400 0:00:00.890657875 32616 0x1d4600 WARN queue2 gstqueue2.c:1610:gst_queue2_create_write:<queue2-0> buffer offset does not match current writing position! 95138 != 99856296 851780 4 192301 pnormand 2013-03-09 04:46:28 -0800 Comment on attachment 192301 Fix offset handling in GStreamer WebKitWebSource Thanks! 851788 5 192301 webkit.review.bot 2013-03-09 08:36:21 -0800 Comment on attachment 192301 Fix offset handling in GStreamer WebKitWebSource Clearing flags on attachment: 192301 Committed r145318: <http://trac.webkit.org/changeset/145318> 851789 6 webkit.review.bot 2013-03-09 08:36:24 -0800 All reviewed patches have been landed. Closing bug. 851834 7 mrobinson 2013-03-09 14:51:28 -0800 This should probably be merged into the WebKitGTK 2.x branch. Do you mind adding it to the merge tracker? 851881 8 slomo 2013-03-09 22:53:36 -0800 How? 851943 9 mrobinson 2013-03-10 11:00:43 -0700 Sorry. You should just add a link to the trac commit page to http://trac.webkit.org/wiki/WebKitGTK/2.0.x . 192298 2013-03-08 15:42:22 -0800 2013-03-08 16:05:03 -0800 Fix offset handling in GStreamer WebKitWebSource 0001-Fix-offset-handling-in-GStreamer-WebKitWebSource.patch text/plain 3581 slomo RnJvbSBlMWZmYjA5MjRlM2E0Nzc3N2E3NDNjMDE3OTcyOTE5YTc0ZDhiYTRhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/U2ViYXN0aWFuPTIwRHI9QzM9QjZnZT89IDxz ZWJhc3RpYW4uZHJvZWdlQGNvbGxhYm9yYS5jby51az4KRGF0ZTogRnJpLCA4IE1hciAyMDEzIDIy OjQzOjE2ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gRml4IG9mZnNldCBoYW5kbGluZyBpbiBHU3Ry ZWFtZXIgV2ViS2l0V2ViU291cmNlCgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTE4ODgKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CgogICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdT dHJlYW1lci5jcHA6CiAgICAgICAgKHdlYktpdFdlYlNyY1NlZWtEYXRhQ2IpOgogICAgICAgIChT dHJlYW1pbmdDbGllbnQ6OmRpZFJlY2VpdmVEYXRhKToKICAgICAgICBUaGUgb2Zmc2V0IGhhbmRs aW5nIGluIFdlYktpdFdlYlNvdXJjZSB3YXMgY29tcGxldGVseSB3cm9uZwogICAgICAgIGJlZm9y ZSBhbmQgY2F1c2VkIHdyb25nIG9mZnNldHMgdG8gYmUgc2V0IG9uIHRoZSBHU3RyZWFtZXIgYnVm ZmVycwogICAgICAgIGFmdGVyIGEgc2Vlay4KCiAgICAgICAgQXBhcnQgZnJvbSB0aGF0IHRoZXJl IHdhcyBhbHNvIGEgcmFjZSBjb25kaXRpb24gdGhhdCBoYXBwZW5zCiAgICAgICAgd2hlbiBhIGRv d25zdHJlYW0gZWxlbWVudCBjYXVzZXMgc2Vla3MgaW4gdmVyeSBzaG9ydCBzdWNjZXNzaW9uCiAg ICAgICAgYW5kIGlzIHN3aXRjaGluZyBiZXR3ZWVuIHR3byBkaWZmZXJlbnQgcGFydHMgb2YgdGhl IHN0cmVhbS4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAxOCArKysrKysrKysrKysrKysrKysKIC4uLi9ncmFwaGljcy9nc3RyZWFt ZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcCAgfCAgICA1ICsrKystCiAyIGZpbGVzIGNo YW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWZh MjEzMC4uMWRiMTFmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA4ICBT ZWJhc3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuLmRyb2VnZUBjb2xsYWJvcmEuY28udWs+CisKKyAg ICAgICAgRml4IG9mZnNldCBoYW5kbGluZyBpbiBHU3RyZWFtZXIgV2ViS2l0V2ViU291cmNlLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExODg4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAg ICAgKHdlYktpdFdlYlNyY1NlZWtEYXRhQ2IpOgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50Ojpk aWRSZWNlaXZlRGF0YSk6CisgICAgICAgIFRoZSBvZmZzZXQgaGFuZGxpbmcgaW4gV2ViS2l0V2Vi U291cmNlIHdhcyBjb21wbGV0ZWx5IHdyb25nCisgICAgICAgIGJlZm9yZSBhbmQgY2F1c2VkIHdy b25nIG9mZnNldHMgdG8gYmUgc2V0IG9uIHRoZSBHU3RyZWFtZXIgYnVmZmVycworICAgICAgICBh ZnRlciBhIHNlZWsuCisKKyAgICAgICAgQXBhcnQgZnJvbSB0aGF0IHRoZXJlIHdhcyBhbHNvIGEg cmFjZSBjb25kaXRpb24gdGhhdCBoYXBwZW5zCisgICAgICAgIHdoZW4gYSBkb3duc3RyZWFtIGVs ZW1lbnQgY2F1c2VzIHNlZWtzIGluIHZlcnkgc2hvcnQgc3VjY2Vzc2lvbgorICAgICAgICBhbmQg aXMgc3dpdGNoaW5nIGJldHdlZW4gdHdvIGRpZmZlcmVudCBwYXJ0cyBvZiB0aGUgc3RyZWFtLgor CiAyMDEzLTAxLTExICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW1vdmUgdW51c2VkIENTU1NlbGVjdG9yKFF1YWxpZmllZE5hbWUpIGNvbnN0cnVjdG9yLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dl YktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCBmODA0ZDFm Li45YWE4ZTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNw cApAQCAtNDM0LDYgKzQzNCw3IEBAIHN0YXRpYyBib29sIHdlYktpdFdlYlNyY1N0YXJ0KFdlYktp dFdlYlNyYyogc3JjKQogICAgICAgICB2YWwuc2V0KGdfc3RyZHVwX3ByaW50ZigiYnl0ZXM9JSIg R19HVUlOVDY0X0ZPUk1BVCAiLSIsIHByaXYtPnJlcXVlc3RlZE9mZnNldCkpOwogICAgICAgICBy ZXF1ZXN0LnNldEhUVFBIZWFkZXJGaWVsZCgiUmFuZ2UiLCB2YWwuZ2V0KCkpOwogICAgIH0KKyAg ICBwcml2LT5vZmZzZXQgPSBwcml2LT5yZXF1ZXN0ZWRPZmZzZXQ7CiAKICAgICBpZiAocHJpdi0+ aXJhZGlvTW9kZSkKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQoImljeS1tZXRh ZGF0YSIsICIxIik7CkBAIC03MTYsNyArNzE3LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdl YlNyY1NlZWtEYXRhQ2IoR3N0QXBwU3JjKiwgZ3VpbnQ2NCBvZmZzZXQsIGdwb2ludGVyIHVzZXIK ICAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gc3JjLT5wcml2OwogCiAgICAgR1NUX0RF QlVHX09CSkVDVChzcmMsICJTZWVraW5nIHRvIG9mZnNldDogJSIgR19HVUlOVDY0X0ZPUk1BVCwg b2Zmc2V0KTsKLSAgICBpZiAob2Zmc2V0ID09IHByaXYtPm9mZnNldCkKKyAgICBpZiAob2Zmc2V0 ID09IHByaXYtPm9mZnNldCAmJiBwcml2LT5yZXF1ZXN0ZWRPZmZzZXQgPT0gcHJpdi0+b2Zmc2V0 KQogICAgICAgICByZXR1cm4gVFJVRTsKIAogICAgIGlmICghcHJpdi0+c2Vla2FibGUpCkBAIC04 NzEsNiArODcyLDggQEAgdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmRpZFJlY2VpdmVEYXRhKFJlc291 cmNlSGFuZGxlKiBoYW5kbGUsIGNvbnN0IGNoYXIqIGRhdGEsIGkKICAgICBtZW1jcHkoR1NUX0JV RkZFUl9EQVRBKGJ1ZmZlciksIGRhdGEsIGxlbmd0aCk7CiAjZW5kaWYKICAgICBHU1RfQlVGRkVS X09GRlNFVChidWZmZXIpID0gcHJpdi0+b2Zmc2V0OworICAgIGlmIChwcml2LT5yZXF1ZXN0ZWRP ZmZzZXQgPT0gcHJpdi0+b2Zmc2V0KQorICAgICAgICBwcml2LT5yZXF1ZXN0ZWRPZmZzZXQgKz0g bGVuZ3RoOwogICAgIHByaXYtPm9mZnNldCArPSBsZW5ndGg7CiAgICAgR1NUX0JVRkZFUl9PRkZT RVRfRU5EKGJ1ZmZlcikgPSBwcml2LT5vZmZzZXQ7CiAKLS0gCjEuNy4xMC40Cgo= 192301 2013-03-08 16:05:03 -0800 2013-03-09 08:36:21 -0800 Fix offset handling in GStreamer WebKitWebSource 0001-Fix-offset-handling-in-GStreamer-WebKitWebSource.patch text/plain 3599 slomo RnJvbSAyNjRlNjIzZjAwMjM3OTk5NWQ0ZWJmYzI1MzY1YzQ1NGJjMDQzMzE0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/U2ViYXN0aWFuPTIwRHI9QzM9QjZnZT89IDxz ZWJhc3RpYW4uZHJvZWdlQGNvbGxhYm9yYS5jby51az4KRGF0ZTogRnJpLCA4IE1hciAyMDEzIDIy OjQzOjE2ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gRml4IG9mZnNldCBoYW5kbGluZyBpbiBHU3Ry ZWFtZXIgV2ViS2l0V2ViU291cmNlCgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTE4ODgKCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CgogICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdT dHJlYW1lci5jcHA6CiAgICAgICAgKHdlYktpdFdlYlNyY1NlZWtEYXRhQ2IpOgogICAgICAgIChT dHJlYW1pbmdDbGllbnQ6OmRpZFJlY2VpdmVEYXRhKToKICAgICAgICBUaGUgb2Zmc2V0IGhhbmRs aW5nIGluIFdlYktpdFdlYlNvdXJjZSB3YXMgY29tcGxldGVseSB3cm9uZwogICAgICAgIGJlZm9y ZSBhbmQgY2F1c2VkIHdyb25nIG9mZnNldHMgdG8gYmUgc2V0IG9uIHRoZSBHU3RyZWFtZXIgYnVm ZmVycwogICAgICAgIGFmdGVyIGEgc2Vlay4KCiAgICAgICAgQXBhcnQgZnJvbSB0aGF0IHRoZXJl IHdhcyBhbHNvIGEgcmFjZSBjb25kaXRpb24gdGhhdCBoYXBwZW5zCiAgICAgICAgd2hlbiBhIGRv d25zdHJlYW0gZWxlbWVudCBjYXVzZXMgc2Vla3MgaW4gdmVyeSBzaG9ydCBzdWNjZXNzaW9uCiAg ICAgICAgYW5kIGlzIHN3aXRjaGluZyBiZXR3ZWVuIHR3byBkaWZmZXJlbnQgcGFydHMgb2YgdGhl IHN0cmVhbS4KLS0tCiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHwgICAxOCArKysrKysrKysrKysrKysrKysKIC4uLi9ncmFwaGljcy9nc3RyZWFt ZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcCAgfCAgICA1ICsrKystCiAyIGZpbGVzIGNo YW5nZWQsIDIyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTdm MGY5MC4uN2Y3YWQyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA4ICBT ZWJhc3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuLmRyb2VnZUBjb2xsYWJvcmEuY28udWs+CisKKyAg ICAgICAgRml4IG9mZnNldCBoYW5kbGluZyBpbiBHU3RyZWFtZXIgV2ViS2l0V2ViU291cmNlLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExODg4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAg ICAgKHdlYktpdFdlYlNyY1NlZWtEYXRhQ2IpOgorICAgICAgICAoU3RyZWFtaW5nQ2xpZW50Ojpk aWRSZWNlaXZlRGF0YSk6CisgICAgICAgIFRoZSBvZmZzZXQgaGFuZGxpbmcgaW4gV2ViS2l0V2Vi U291cmNlIHdhcyBjb21wbGV0ZWx5IHdyb25nCisgICAgICAgIGJlZm9yZSBhbmQgY2F1c2VkIHdy b25nIG9mZnNldHMgdG8gYmUgc2V0IG9uIHRoZSBHU3RyZWFtZXIgYnVmZmVycworICAgICAgICBh ZnRlciBhIHNlZWsuCisKKyAgICAgICAgQXBhcnQgZnJvbSB0aGF0IHRoZXJlIHdhcyBhbHNvIGEg cmFjZSBjb25kaXRpb24gdGhhdCBoYXBwZW5zCisgICAgICAgIHdoZW4gYSBkb3duc3RyZWFtIGVs ZW1lbnQgY2F1c2VzIHNlZWtzIGluIHZlcnkgc2hvcnQgc3VjY2Vzc2lvbgorICAgICAgICBhbmQg aXMgc3dpdGNoaW5nIGJldHdlZW4gdHdvIGRpZmZlcmVudCBwYXJ0cyBvZiB0aGUgc3RyZWFtLgor CiAyMDEzLTAzLTA4ICBIYXJhbGQgQWx2ZXN0cmFuZCAgPGh0YUBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgSW1wbGVtZW50ZWQgbmV3IEFQSSBmb3IgUlRDU3RhdHNSZXBvcnQgb2JqZWN0LgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktp dFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCBmY2ViYjNkLi41 YjJhZGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApA QCAtNDY0LDYgKzQ2NCw3IEBAIHN0YXRpYyBib29sIHdlYktpdFdlYlNyY1N0YXJ0KFdlYktpdFdl YlNyYyogc3JjKQogICAgICAgICB2YWwuc2V0KGdfc3RyZHVwX3ByaW50ZigiYnl0ZXM9JSIgR19H VUlOVDY0X0ZPUk1BVCAiLSIsIHByaXYtPnJlcXVlc3RlZE9mZnNldCkpOwogICAgICAgICByZXF1 ZXN0LnNldEhUVFBIZWFkZXJGaWVsZCgiUmFuZ2UiLCB2YWwuZ2V0KCkpOwogICAgIH0KKyAgICBw cml2LT5vZmZzZXQgPSBwcml2LT5yZXF1ZXN0ZWRPZmZzZXQ7CiAKICAgICBpZiAocHJpdi0+aXJh ZGlvTW9kZSkKICAgICAgICAgcmVxdWVzdC5zZXRIVFRQSGVhZGVyRmllbGQoImljeS1tZXRhZGF0 YSIsICIxIik7CkBAIC03NDYsNyArNzQ3LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNy Y1NlZWtEYXRhQ2IoR3N0QXBwU3JjKiwgZ3VpbnQ2NCBvZmZzZXQsIGdwb2ludGVyIHVzZXIKICAg ICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2ID0gc3JjLT5wcml2OwogCiAgICAgR1NUX0RFQlVH X09CSkVDVChzcmMsICJTZWVraW5nIHRvIG9mZnNldDogJSIgR19HVUlOVDY0X0ZPUk1BVCwgb2Zm c2V0KTsKLSAgICBpZiAob2Zmc2V0ID09IHByaXYtPm9mZnNldCkKKyAgICBpZiAob2Zmc2V0ID09 IHByaXYtPm9mZnNldCAmJiBwcml2LT5yZXF1ZXN0ZWRPZmZzZXQgPT0gcHJpdi0+b2Zmc2V0KQog ICAgICAgICByZXR1cm4gVFJVRTsKIAogICAgIGlmICghcHJpdi0+c2Vla2FibGUpCkBAIC05MDks NiArOTEwLDggQEAgdm9pZCBTdHJlYW1pbmdDbGllbnQ6OmRpZFJlY2VpdmVEYXRhKFJlc291cmNl SGFuZGxlKiBoYW5kbGUsIGNvbnN0IGNoYXIqIGRhdGEsIGkKICAgICAgICAgc2V0R3N0QnVmZmVy U2l6ZShwcml2LT5idWZmZXIuZ2V0KCksIGxlbmd0aCk7CiAKICAgICBHU1RfQlVGRkVSX09GRlNF VChwcml2LT5idWZmZXIuZ2V0KCkpID0gcHJpdi0+b2Zmc2V0OworICAgIGlmIChwcml2LT5yZXF1 ZXN0ZWRPZmZzZXQgPT0gcHJpdi0+b2Zmc2V0KQorICAgICAgICBwcml2LT5yZXF1ZXN0ZWRPZmZz ZXQgKz0gbGVuZ3RoOwogICAgIHByaXYtPm9mZnNldCArPSBsZW5ndGg7CiAgICAgR1NUX0JVRkZF Ul9PRkZTRVRfRU5EKHByaXYtPmJ1ZmZlci5nZXQoKSkgPSBwcml2LT5vZmZzZXQ7CiAKLS0gCjEu Ny4xMC40Cgo=