65270 2011-07-27 11:29:12 -0700 Load delegate not consulted before loading some poster images 2011-07-29 14:31:09 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson joepeck oldest_to_newest 443030 0 eric.carlson 2011-07-27 11:29:12 -0700 The resource load delegate does not get a chance to block a poster image loaded directly by a media engine. 443031 1 eric.carlson 2011-07-27 11:29:23 -0700 rdar://8904358 443139 2 102180 eric.carlson 2011-07-27 14:00:35 -0700 Created attachment 102180 Proposed patch. 443171 3 eric.carlson 2011-07-27 15:01:30 -0700 http://trac.webkit.org/changeset/91872 443588 4 eric.carlson 2011-07-28 11:46:03 -0700 Reopening as r65270 causes an assert in a debug build with a media engine that supports poster loading. 443601 5 102283 eric.carlson 2011-07-28 12:11:10 -0700 Created attachment 102283 Proposed patch. 444047 6 102283 joepeck 2011-07-29 12:51:01 -0700 Comment on attachment 102283 Proposed patch. r=me thanks! 444055 7 102283 joepeck 2011-07-29 13:06:25 -0700 Comment on attachment 102283 Proposed patch. I assume you don't need to set the empty poster url on the player? 444095 8 eric.carlson 2011-07-29 14:16:50 -0700 (In reply to comment #7) > (From update of attachment 102283 [details]) > I assume you don't need to set the empty poster url on the player? Excellent point, my patch will prevent the poster from being cleared. Update coming up... 444098 9 102395 eric.carlson 2011-07-29 14:18:18 -0700 Created attachment 102395 Updated patch 444101 10 102395 joepeck 2011-07-29 14:23:29 -0700 Comment on attachment 102395 Updated patch r=me! 444107 11 eric.carlson 2011-07-29 14:31:09 -0700 http://trac.webkit.org/changeset/92009 102180 2011-07-27 14:00:35 -0700 2011-07-28 12:11:23 -0700 Proposed patch. patch_1.txt text/plain 5159 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxODY1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDctMjcgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTG9hZCBkZWxlZ2F0ZSBu b3QgY29uc3VsdGVkIGJlZm9yZSBsb2FkaW5nIHNvbWUgcG9zdGVyIGltYWdlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUyNzAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBtZWRpYS92aWRlby1w b3N0ZXItYmxvY2tlZC1ieS13aWxsc2VuZHJlcXVlc3QuaHRtbAorCisgICAgICAgICogaHRtbC9I VE1MVmlkZW9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxWaWRlb0VsZW1lbnQ6 OnNldERpc3BsYXlNb2RlKTogRG9uJ3QgYXNrIG1lZGlhIGVuZ2luZSB0byBzZXQgcG9zdGVyIGlm CisgICAgICAgICAgICB3aWxsTG9hZE1lZGlhRWxlbWVudFVSTCByZXR1cm5zIGZhbHNlLgorCiAy MDExLTA3LTI1ICBNaWhhaSBQYXJwYXJpdGEgIDxtaWhhaXBAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFtDaHJvbWl1bV0gQWRkIGJldHRlciBXZWJLaXQgQVBJIGZvciBjaHJvbWUudGFicy5pbnNl cnRDU1MgZXh0ZW5zaW9uIEFQSQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlkZW9F bGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWRlb0Vs ZW1lbnQuY3BwCShyZXZpc2lvbiA5MTg2MSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZp ZGVvRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKICNpbmNsdWRl ICJDaHJvbWVDbGllbnQuaCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkV4Y2Vw dGlvbkNvZGUuaCIKKyNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkhUTUxJbWFnZUxvYWRl ci5oIgogI2luY2x1ZGUgIkhUTUxOYW1lcy5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKQEAgLTE5Niw4 ICsxOTcsMTIgQEAgdm9pZCBIVE1MVmlkZW9FbGVtZW50OjpzZXREaXNwbGF5TW9kZShEaQogCiAg ICAgSFRNTE1lZGlhRWxlbWVudDo6c2V0RGlzcGxheU1vZGUobW9kZSk7CiAKLSAgICBpZiAocGxh eWVyKCkgJiYgcGxheWVyKCktPmNhbkxvYWRQb3N0ZXIoKSkKLSAgICAgICAgcGxheWVyKCktPnNl dFBvc3Rlcihwb3N0ZXIpOworICAgIGlmIChwbGF5ZXIoKSAmJiBwbGF5ZXIoKS0+Y2FuTG9hZFBv c3RlcigpKSB7CisgICAgICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50KCktPmZyYW1lKCk7Cisg ICAgICAgIEZyYW1lTG9hZGVyKiBsb2FkZXIgPSBmcmFtZSA/IGZyYW1lLT5sb2FkZXIoKSA6IDA7 CisgICAgICAgIGlmIChsb2FkZXIgJiYgbG9hZGVyLT53aWxsTG9hZE1lZGlhRWxlbWVudFVSTChw b3N0ZXIpKQorICAgICAgICAgICAgcGxheWVyKCktPnNldFBvc3Rlcihwb3N0ZXIpOworICAgIH0K IAogI2lmICFFTkFCTEUoUExVR0lOX1BST1hZX0ZPUl9WSURFTykKICAgICBpZiAocmVuZGVyZXIo KSAmJiBkaXNwbGF5TW9kZSgpICE9IG9sZE1vZGUpCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA5MTg2NSkK KysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDExLTA3LTI3ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisg ICAgICAgIExvYWQgZGVsZWdhdGUgbm90IGNvbnN1bHRlZCBiZWZvcmUgbG9hZGluZyBzb21lIHBv c3RlciBpbWFnZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY1MjcwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBtZWRpYS92aWRlby1wb3N0ZXItYmxvY2tlZC1ieS13aWxsc2VuZHJlcXVlc3QtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBtZWRpYS92aWRlby1wb3N0ZXItYmxvY2tlZC1ieS13 aWxsc2VuZHJlcXVlc3QuaHRtbDogQWRkZWQuCisKIDIwMTEtMDctMjcgIFJ5b3N1a2UgTml3YSAg PHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ2hyb21pdW0gcmViYXNlbGluZXMgZm9yIHI4 OTYyNyBhbmQgcjkxNDk3LgpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcG9zdGVyLWJs b2NrZWQtYnktd2lsbHNlbmRyZXF1ZXN0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9tZWRpYS92aWRlby1wb3N0ZXItYmxvY2tlZC1ieS13aWxsc2VuZHJlcXVlc3QtZXhw ZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcG9zdGVy LWJsb2NrZWQtYnktd2lsbHNlbmRyZXF1ZXN0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwxMyBAQAorVGVzdCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY1MjcwLiAKK1Jlc291cmNlIGxvYWQgZGVsZWdhdGUgc2hvdWxkIGJlIGFibGUgdG8g YmxvY2sgcG9zdGVyIGxvYWRpbmcuCisKKworVGVzdGluZyBiZWZvcmUgc2V0dGluZyBwb3N0ZXIK K0VYUEVDVEVEICh2aWRlby5jbGllbnRXaWR0aCA9PSAnMzAwJykgT0sKK0VYUEVDVEVEICh2aWRl by5jbGllbnRIZWlnaHQgPT0gJzE1MCcpIE9LCisKK1Rlc3QgYWZ0ZXIgc2V0dGluZyBwb3N0ZXIK K0VYUEVDVEVEICh2aWRlby5jbGllbnRXaWR0aCA9PSAnMzAwJykgT0sKK0VYUEVDVEVEICh2aWRl by5jbGllbnRIZWlnaHQgPT0gJzE1MCcpIE9LCitFTkQgT0YgVEVTVAorCkluZGV4OiBMYXlvdXRU ZXN0cy9tZWRpYS92aWRlby1wb3N0ZXItYmxvY2tlZC1ieS13aWxsc2VuZHJlcXVlc3QuaHRtbAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wb3N0ZXItYmxvY2tlZC1ieS13 aWxsc2VuZHJlcXVlc3QuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL21lZGlhL3Zp ZGVvLXBvc3Rlci1ibG9ja2VkLWJ5LXdpbGxzZW5kcmVxdWVzdC5odG1sCShyZXZpc2lvbiAwKQpA QCAtMCwwICsxLDUyIEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorICAgIDxoZWFkPgorICAg ICAgICA8c3R5bGU+CisgICAgICAgICAgICB2aWRlbyB7CisgICAgICAgICAgICAgICAgYm9yZGVy OiAzcHggc29saWQgcmVkOworICAgICAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IG1hZ2Vu dGE7CisgICAgICAgICAgICB9CisgICAgICAgIDwvc3R5bGU+CisKKyAgICAgICAgPHNjcmlwdCBz cmM9dmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgCisg ICAgICAgICAgICB2YXIgd2lkdGgsIGhlaWdodDsKKyAgICAgICAgCisgICAgICAgICAgICBmdW5j dGlvbiB0ZXN0QWZ0ZXJMb2FkaW5nUG9zdGVyKCkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICBjb25zb2xlV3JpdGUoIjxicj48Yj5UZXN0IGFmdGVyIHNldHRpbmcgcG9zdGVyPC9iPiIp OworCisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jbGllbnRXaWR0aCIsIDMw MCk7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jbGllbnRIZWlnaHQiLCAx NTApOworCisgICAgICAgICAgICAgICAgZW5kVGVzdCgpOworICAgICAgICAgICAgfQorCisgICAg ICAgICAgICBmdW5jdGlvbiBzdGFydCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAg aWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICAgICAgICAgICAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICAgICAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLnNldFdpbGxTZW5kUmVxdWVzdFJldHVybnNOdWxsKHRydWUpOwor ICAgICAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUo IjxiPlRoaXMgdGVzdCBjYW4gb25seSBiZSBydW4gaW4gRHVtcFJlbmRlclRyZWUhPC9iPiIpOwor CisgICAgICAgICAgICAgICAgdmlkZW8gPSBkb2N1bWVudC5xdWVyeVNlbGVjdG9yQWxsKCd2aWRl bycpWzBdOworCisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCI8YnI+PGI+VGVzdGluZyBi ZWZvcmUgc2V0dGluZyBwb3N0ZXI8L2I+Iik7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJ2aWRlby5jbGllbnRXaWR0aCIsIDMwMCk7CisgICAgICAgICAgICAgICAgdGVzdEV4cGVjdGVk KCJ2aWRlby5jbGllbnRIZWlnaHQiLCAxNTApOworCisgICAgICAgICAgICAgICAgdmlkZW8ucG9z dGVyID0gImNvbnRlbnQvYWJlLnBuZyI7CisKKyAgICAgICAgICAgICAgICBzZXRUaW1lb3V0KHRl c3RBZnRlckxvYWRpbmdQb3N0ZXIsIDEwMCk7CisgICAgICAgICAgICB9CisgICAgICAgIDwvc2Ny aXB0PgorICAgIDwvaGVhZD4KKworICAgIDxib2R5IG9ubG9hZD0ic3RhcnQoKSI+CisgICAgICAg IDx2aWRlbyBpZD12aWRlbz48L3ZpZGVvPgorICAgICAgICA8cD5UZXN0IGZvciA8YSBocmVmPSJo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUyNzAiPmh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTI3MDwvYT4uIDxicj4KKyAgICAgICAgUmVz b3VyY2UgbG9hZCBkZWxlZ2F0ZSBzaG91bGQgYmUgYWJsZSB0byBibG9jayBwb3N0ZXIgbG9hZGlu Zy48L3A+CisgICAgPC9ib2R5PgorPC9odG1sPgo= 102283 2011-07-28 12:11:10 -0700 2011-07-29 14:18:18 -0700 Proposed patch. patch_2.txt text/plain 1346 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkxOTQwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDctMjggIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTG9hZCBkZWxlZ2F0ZSBu b3QgY29uc3VsdGVkIGJlZm9yZSBsb2FkaW5nIHNvbWUgcG9zdGVyIGltYWdlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUyNzAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50OjpzZXREaXNwbGF5 TW9kZSk6IERvbid0IGFzayBhIG1lZGlhIGVuZ2luZSB0byBsb2FkIGFuIGVtcHR5CisgICAgICAg ICAgICBwb3N0ZXIgdXJsLgorCiAyMDExLTA3LTI4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CiAKICAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNjUyODk+IFJlbW92ZSBH ZW9sb2NhdGlvblBvc2l0aW9uQ2FjaGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFZp ZGVvRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlk ZW9FbGVtZW50LmNwcAkocmV2aXNpb24gOTE4NzIpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxWaWRlb0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTcsNyArMTk3LDcgQEAgdm9p ZCBIVE1MVmlkZW9FbGVtZW50OjpzZXREaXNwbGF5TW9kZShEaQogCiAgICAgSFRNTE1lZGlhRWxl bWVudDo6c2V0RGlzcGxheU1vZGUobW9kZSk7CiAKLSAgICBpZiAocGxheWVyKCkgJiYgcGxheWVy KCktPmNhbkxvYWRQb3N0ZXIoKSkgeworICAgIGlmICghcG9zdGVyLmlzRW1wdHkoKSAmJiBwbGF5 ZXIoKSAmJiBwbGF5ZXIoKS0+Y2FuTG9hZFBvc3RlcigpKSB7CiAgICAgICAgIEZyYW1lKiBmcmFt ZSA9IGRvY3VtZW50KCktPmZyYW1lKCk7CiAgICAgICAgIEZyYW1lTG9hZGVyKiBsb2FkZXIgPSBm cmFtZSA/IGZyYW1lLT5sb2FkZXIoKSA6IDA7CiAgICAgICAgIGlmIChsb2FkZXIgJiYgbG9hZGVy LT53aWxsTG9hZE1lZGlhRWxlbWVudFVSTChwb3N0ZXIpKQo= 102395 2011-07-29 14:18:18 -0700 2011-07-29 14:23:29 -0700 Updated patch patch_3.txt text/plain 1668 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMDA2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDctMjkgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTG9hZCBkZWxlZ2F0ZSBu b3QgY29uc3VsdGVkIGJlZm9yZSBsb2FkaW5nIHNvbWUgcG9zdGVyIGltYWdlcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUyNzAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0bWwvSFRNTFZpZGVvRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlkZW9FbGVtZW50OjpzZXREaXNwbGF5 TW9kZSk6IERvbid0IGFzayBhIGxvYWQgZGVsZWdhdGUgaWYgaXQgaXMgT0sgdG8gCisgICAgICAg ICAgICBsb2FkIGFuIGVtcHR5IHBvc3RlciB1cmwuCisKIDIwMTEtMDctMjkgIERhbiBCZXJuc3Rl aW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRlZCB0aGUgcmVnaW9uYWwgaW5kaWNh dG9yIHN5bWJvbHMgdG8gdGhlIHNldCBvZiBjb2RlcG9pbnRzIHRoYXQgZm9yY2UgdXNlIG9mIHRo ZSBjb21wbGV4IHRleHQgY29kZSBwYXRoLgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M VmlkZW9FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxW aWRlb0VsZW1lbnQuY3BwCShyZXZpc2lvbiA5MTg3MikKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFZpZGVvRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5OCw5ICsxOTgsMTMgQEAg dm9pZCBIVE1MVmlkZW9FbGVtZW50OjpzZXREaXNwbGF5TW9kZShEaQogICAgIEhUTUxNZWRpYUVs ZW1lbnQ6OnNldERpc3BsYXlNb2RlKG1vZGUpOwogCiAgICAgaWYgKHBsYXllcigpICYmIHBsYXll cigpLT5jYW5Mb2FkUG9zdGVyKCkpIHsKLSAgICAgICAgRnJhbWUqIGZyYW1lID0gZG9jdW1lbnQo KS0+ZnJhbWUoKTsKLSAgICAgICAgRnJhbWVMb2FkZXIqIGxvYWRlciA9IGZyYW1lID8gZnJhbWUt PmxvYWRlcigpIDogMDsKLSAgICAgICAgaWYgKGxvYWRlciAmJiBsb2FkZXItPndpbGxMb2FkTWVk aWFFbGVtZW50VVJMKHBvc3RlcikpCisgICAgICAgIGJvb2wgY2FuTG9hZCA9IHRydWU7CisgICAg ICAgIGlmICghcG9zdGVyLmlzRW1wdHkoKSkgeworICAgICAgICAgICAgRnJhbWUqIGZyYW1lID0g ZG9jdW1lbnQoKS0+ZnJhbWUoKTsKKyAgICAgICAgICAgIEZyYW1lTG9hZGVyKiBsb2FkZXIgPSBm cmFtZSA/IGZyYW1lLT5sb2FkZXIoKSA6IDA7CisgICAgICAgICAgICBjYW5Mb2FkID0gbG9hZGVy ICYmIGxvYWRlci0+d2lsbExvYWRNZWRpYUVsZW1lbnRVUkwocG9zdGVyKTsKKyAgICAgICAgfQor ICAgICAgICBpZiAoY2FuTG9hZCkKICAgICAgICAgICAgIHBsYXllcigpLT5zZXRQb3N0ZXIocG9z dGVyKTsKICAgICB9CiAK