42384 2010-07-15 09:39:03 -0700 Send JavaScript stream data to plug-ins 2010-07-15 11:19:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca darin webkit.review.bot oldest_to_newest 251939 0 andersca 2010-07-15 09:39:03 -0700 Send JavaScript stream data to plug-ins 251942 1 61675 andersca 2010-07-15 09:44:06 -0700 Created attachment 61675 Patch 251948 2 webkit.review.bot 2010-07-15 09:49:46 -0700 Attachment 61675 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:65: NPP_WriteReady is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.h:66: NPP_Write is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp:161: NetscapePlugin::NPP_WriteReady is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp:166: NetscapePlugin::NPP_Write is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 251949 3 61675 darin 2010-07-15 09:51:45 -0700 Comment on attachment 61675 Patch > +void NetscapePluginStream::deliverData(const char* bytes, int length) int? int32_t? unsigned? uint32_t? size_t? Our seemingly random length types drive me crazy! Does this already have layout test coverage? r=me 251964 4 andersca 2010-07-15 10:13:54 -0700 (In reply to comment #3) > (From update of attachment 61675 [details]) > > +void NetscapePluginStream::deliverData(const char* bytes, int length) > > int? int32_t? unsigned? uint32_t? size_t? Our seemingly random length types drive me crazy! > Yeah it's really annoying. I used the same type as ResourceHandleClient::didReceiveData. We should definitly fix didReceiveData and all the clients etc to use a size_t instead. > Does this already have layout test coverage? Yes. 252003 5 andersca 2010-07-15 11:19:53 -0700 Committed r63439: <http://trac.webkit.org/changeset/63439> 61675 2010-07-15 09:44:06 -0700 2010-07-15 09:51:45 -0700 Patch bug-42384-20100715094405.patch text/plain 9445 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg M2Y4NzY2YWM2MWI0OGM0NGM3MGQ0Y2FhZWQ0NTk5MWJiOGZkY2EwNC4uZTEyOWQ3YTI3ZjA2MDE4 ZjIwY2VjMGRmMWI2YmZhYzJiYmU4MzM0OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxMC0wNy0xNSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlbmQgSmF2YVNjcmlwdCBzdHJlYW0gZGF0YSB0 byBwbHVnLWlucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDIzODQKKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2Fw ZVBsdWdpbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpOUFBfV3JpdGVS ZWFkeSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpOUFBfV3JpdGUpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5oOgorICAg ICAgICBBZGQgTlBQXyB3cmFwcGVycy4KKyAgICAgICAgCisgICAgICAgICogV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TmV0c2NhcGVQbHVnaW5TdHJlYW06Ok5ldHNjYXBlUGx1Z2luU3RyZWFtKToKKyAgICAgICAg SW5pdGlhbGl6ZSBtX2RlbGl2ZXJ5RGF0YVRpbWVyIGFuZCBtX3N0b3BzdHJlYW1XaGVuRG9uZURl bGl2ZXJpbmcuCisKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW5TdHJlYW06OnNlbmRK YXZhU2NyaXB0U3RyZWFtKToKKyAgICAgICAgQ2FsbCBkZWxpdmVyRGF0YSBhbmQgc3RvcC4KKwor ICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpblN0cmVhbTo6ZGVsaXZlckRhdGEpOgorICAg ICAgICBBZGQgdGhlIGRhdGEgdG8gbV9kZWxpdmVyeURhdGEgYW5kIGNhbGwgZGVsaXZlckRhdGFU b1BsdWdpbi4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpblN0cmVhbTo6ZGVsaXZl ckRhdGFUb1BsdWdpbik6CisgICAgICAgIERlbGl2ZXIgdGhlIGRhdGEgaW4gbV9kZWxpdmVyeURh dGEgdG8gdGhlIHBsdWctaW4uIENhbGwgTlBQX1dyaXRlUmVhZHkgdG8gc2VlIGhvdyBtdWNoCisg ICAgICAgIGRhdGEgdGhlIHBsdWctaW4gY2FuIGhhbmRsZSByaWdodCBub3cuIElmIHRoZSBwbHVn LWluIHJldHVybnMgemVybyBvciBhIG5lZ2F0aXZlIHZhbHVlLCBkZWxheSB0aGUKKyAgICAgICAg ZGVsaXZlcnkgdXNpbmcgdGhlIGRlbGl2ZXJ5IGRhdGEgdGltZXIuIE90aGVyd2lzZSwgY2FsbCBO UFBfV3JpdGUgaW4gY2h1bmtzIHVudGlsIGFsbCB0aGUgZGF0YSBoYXMgYmVlbgorICAgICAgICBk ZWxpdmVyZWQsIHRoZW4gc3RvcCB0aGUgc3RyZWFtIGlmIG5lZWRlZC4KKworICAgICAgICAoV2Vi S2l0OjpOZXRzY2FwZVBsdWdpblN0cmVhbTo6c3RvcCk6CisgICAgICAgIElmIHRoZSByZWFzb24g Zm9yIHN0b3BwaW5nIHRoZSBzdHJlYW0gaXMgdGhhdCBpdCdzIGZpbmlzaGVkIGFuZCB0aGUgcGx1 Zy1pbiBoYXNuJ3QgcHJvY2Vzc2VkIGFsbCB0aGUgZGF0YSwKKyAgICAgICAgZG9uJ3QgY2xvc2Ug dGhlIHN0cmVhbSBub3cuIEluc3RlYWQsIHNldCBtX3N0b3BTdHJlYW1XaGVuRG9uZURlbGl2ZXJp bmcgdG8gdHJ1ZSB3aGljaCB3aWxsIGNhdXNlIHRoZSBzdHJlYW0gdG8gYmUKKyAgICAgICAgY2xv c2VkIG9uY2UgYWxsIGRhdGEgaGFzIGJlZW4gZGVsaXZlcmVkLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmg6CisgICAgICAgIEFk ZCBtZW1iZXIgZnVuY3Rpb25zIGFuZCBtZW1iZXIgdmFyaWFibGVzLgorCiAyMDEwLTA3LTE0ICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5IHRvIGZp eCBXaW5kb3dzIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMv TmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCmluZGV4IDBhMWM4NzZlZmNlZmU4MDdhYmZlZjE5 ZjYwMDc3ZGM5NmZkYTdkY2IuLmY5YTRlM2ZmMDFjMjBmOTUzYTAwMjRjNTNjNDBiMDI2MWEyZmE1 YzkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNj YXBlUGx1Z2luLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9O ZXRzY2FwZVBsdWdpbi5jcHAKQEAgLTE1OCw2ICsxNTgsMTYgQEAgTlBFcnJvciBOZXRzY2FwZVBs dWdpbjo6TlBQX0Rlc3Ryb3lTdHJlYW0oTlBTdHJlYW0qIHN0cmVhbSwgTlBSZWFzb24gcmVhc29u KQogICAgIHJldHVybiBtX3BsdWdpbk1vZHVsZS0+cGx1Z2luRnVuY3MoKS5kZXN0cm95c3RyZWFt KCZtX25wcCwgc3RyZWFtLCByZWFzb24pOwogfQogCitpbnQzMl90IE5ldHNjYXBlUGx1Z2luOjpO UFBfV3JpdGVSZWFkeShOUFN0cmVhbSogc3RyZWFtKQoreworICAgIHJldHVybiBtX3BsdWdpbk1v ZHVsZS0+cGx1Z2luRnVuY3MoKS53cml0ZXJlYWR5KCZtX25wcCwgc3RyZWFtKTsKK30KKworaW50 MzJfdCBOZXRzY2FwZVBsdWdpbjo6TlBQX1dyaXRlKE5QU3RyZWFtKiBzdHJlYW0sIGludDMyX3Qg b2Zmc2V0LCBpbnQzMl90IGxlbiwgdm9pZCogYnVmZmVyKQoreworICAgIHJldHVybiBtX3BsdWdp bk1vZHVsZS0+cGx1Z2luRnVuY3MoKS53cml0ZSgmbV9ucHAsIHN0cmVhbSwgb2Zmc2V0LCBsZW4s IGJ1ZmZlcik7Cit9CisKIHZvaWQgTmV0c2NhcGVQbHVnaW46Ok5QUF9VUkxOb3RpZnkoY29uc3Qg Y2hhciogdXJsLCBOUFJlYXNvbiByZWFzb24sIHZvaWQqIG5vdGlmeURhdGEpCiB7CiAgICAgbV9w bHVnaW5Nb2R1bGUtPnBsdWdpbkZ1bmNzKCkudXJsbm90aWZ5KCZtX25wcCwgdXJsLCByZWFzb24s IG5vdGlmeURhdGEpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0 c2NhcGUvTmV0c2NhcGVQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luLmgKaW5kZXggNDc4NjAzNGE5YzAzNjBhMjFjOWU2OTZkNGE0Njc0 YWZhODUyZjYwMy4uYjc4NjJhODJhOTYwODJhNjhjYWI2OWNmNDA4YzY4MTBiNWNkMmM1MyAxMDA2 NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVn aW4uaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBs dWdpbi5oCkBAIC02Miw2ICs2Miw5IEBAIHB1YmxpYzoKICAgICBOUEVycm9yIE5QUF9TZXRXaW5k b3coTlBXaW5kb3cqKTsKICAgICBOUEVycm9yIE5QUF9OZXdTdHJlYW0oTlBNSU1FVHlwZSwgTlBT dHJlYW0qLCBOUEJvb2wgc2Vla2FibGUsIHVpbnQxNl90KiBzdHlwZSk7CiAgICAgTlBFcnJvciBO UFBfRGVzdHJveVN0cmVhbShOUFN0cmVhbSosIE5QUmVhc29uKTsKKyAgICBpbnQzMl90IE5QUF9X cml0ZVJlYWR5KE5QU3RyZWFtKik7CisgICAgaW50MzJfdCBOUFBfV3JpdGUoTlBTdHJlYW0qLCBp bnQzMl90IG9mZnNldCwgaW50MzJfdCBsZW4sIHZvaWQqIGJ1ZmZlcik7CisKICAgICB2b2lkIE5Q UF9VUkxOb3RpZnkoY29uc3QgY2hhciogdXJsLCBOUFJlYXNvbiByZWFzb24sIHZvaWQqIG5vdGlm eURhdGEpOwogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwCmluZGV4IDY1MWI2Zjky MTY1ZWY2ZDkwMDI2OWU5MjJmMjU1YjM5MmI2ZTZmZmMuLjc4MTZlOWU1MDE0OWNhNzg0ZjI1NGM0 OTA2NDdmNTQxMGQ0MTE3NjQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5jcHAKQEAgLTI2LDggKzI2 LDEwIEBACiAjaW5jbHVkZSAiTmV0c2NhcGVQbHVnaW5TdHJlYW0uaCIKIAogI2luY2x1ZGUgIk5l dHNjYXBlUGx1Z2luLmgiCisjaW5jbHVkZSA8dXRpbGl0eT4KIAogdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7Cit1c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAt NDAsNiArNDIsOCBAQCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6TmV0c2NhcGVQbHVnaW5TdHJlYW0o UGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbj4gcGx1Z2luLCB1aQogICAgICwgbV90cmFuc2Zlck1v ZGUoTlBfTk9STUFMKQogICAgICwgbV9vZmZzZXQoMCkKICAgICAsIG1faXNTdGFydGVkKGZhbHNl KQorICAgICwgbV9kZWxpdmVyeURhdGFUaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZOZXRz Y2FwZVBsdWdpblN0cmVhbTo6ZGVsaXZlckRhdGFUb1BsdWdpbikKKyAgICAsIG1fc3RvcFN0cmVh bVdoZW5Eb25lRGVsaXZlcmluZyhmYWxzZSkKIHsKIH0KIApAQCAtNjIsNyArNjYsOCBAQCB2b2lk IE5ldHNjYXBlUGx1Z2luU3RyZWFtOjpzZW5kSmF2YVNjcmlwdFN0cmVhbShjb25zdCBTdHJpbmcm IHJlcXVlc3RVUkxTdHJpbmcsCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBGSVhN RTogU2VuZCB0aGUgSmF2YVNjcmlwdCBzdHJpbmcgYXMgd2VsbC4KKyAgICBkZWxpdmVyRGF0YShy ZXN1bHRDU3RyaW5nLmRhdGEoKSwgcmVzdWx0Q1N0cmluZy5sZW5ndGgoKSk7CisgICAgc3RvcChO UFJFU19ET05FKTsKIH0KIAogYm9vbCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6c3RhcnQoY29uc3Qg V2ViQ29yZTo6U3RyaW5nJiByZXNwb25zZVVSTFN0cmluZywgdWludDMyX3QgZXhwZWN0ZWRDb250 ZW50TGVuZ3RoLCAKQEAgLTEwMCwxNCArMTA1LDkzIEBAIGJvb2wgTmV0c2NhcGVQbHVnaW5TdHJl YW06OnN0YXJ0KGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgcmVzcG9uc2VVUkxTdHJpbmcsIHVpbnQz CiAKICAgICByZXR1cm4gdHJ1ZTsKIH0KLSAgICAKKwordm9pZCBOZXRzY2FwZVBsdWdpblN0cmVh bTo6ZGVsaXZlckRhdGEoY29uc3QgY2hhciogYnl0ZXMsIGludCBsZW5ndGgpCit7CisgICAgQVNT RVJUKG1faXNTdGFydGVkKTsKKworICAgIGlmIChtX3RyYW5zZmVyTW9kZSAhPSBOUF9BU0ZJTEVP TkxZKSB7CisgICAgICAgIGlmICghbV9kZWxpdmVyeURhdGEpCisgICAgICAgICAgICBtX2RlbGl2 ZXJ5RGF0YS5zZXQobmV3IFZlY3RvcjxjaGFyPik7CisKKyAgICAgICAgbV9kZWxpdmVyeURhdGEt PnJlc2VydmVDYXBhY2l0eShtX2RlbGl2ZXJ5RGF0YS0+c2l6ZSgpICsgbGVuZ3RoKTsKKyAgICAg ICAgbV9kZWxpdmVyeURhdGEtPmFwcGVuZChieXRlcywgbGVuZ3RoKTsKKyAgICAgICAgCisgICAg ICAgIGRlbGl2ZXJEYXRhVG9QbHVnaW4oKTsKKyAgICB9CisKKyAgICAvLyBGSVhNRTogRGVsaXZl ciB0aGUgZGF0YSB0byBhIGZpbGUgYXMgd2VsbCBpZiBuZWVkZWQuCit9CisKK3ZvaWQgTmV0c2Nh cGVQbHVnaW5TdHJlYW06OmRlbGl2ZXJEYXRhVG9QbHVnaW4oKQoreworICAgIEFTU0VSVChtX2lz U3RhcnRlZCk7CisKKyAgICBpbnQzMl90IG51bUJ5dGVzVG9EZWxpdmVyID0gbV9kZWxpdmVyeURh dGEtPnNpemUoKTsKKyAgICBpbnQzMl90IG51bUJ5dGVzRGVsaXZlcmVkID0gMDsKKworICAgIHdo aWxlIChudW1CeXRlc0RlbGl2ZXJlZCA8IG51bUJ5dGVzVG9EZWxpdmVyKSB7CisgICAgICAgIGlu dDMyX3QgbnVtQnl0ZXNQbHVnaW5DYW5IYW5kbGUgPSBtX3BsdWdpbi0+TlBQX1dyaXRlUmVhZHko Jm1fbnBTdHJlYW0pOworICAgICAgICAKKyAgICAgICAgaWYgKG51bUJ5dGVzUGx1Z2luQ2FuSGFu ZGxlIDw9IDApIHsKKyAgICAgICAgICAgIC8vIFRoZSBwbHVnLWluIGNhbid0IGhhbmRsZSBtb3Jl IGRhdGEsIHdlJ2xsIHNlbmQgdGhlIHJlc3QgbGF0ZXIKKyAgICAgICAgICAgIG1fZGVsaXZlcnlE YXRhVGltZXIuc3RhcnRPbmVTaG90KDApOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0K KworICAgICAgICAvLyBGaWd1cmUgb3V0IGhvdyBtdWNoIGRhdGEgdG8gc2VuZCB0byB0aGUgcGx1 Zy1pbi4KKyAgICAgICAgaW50MzJfdCBkYXRhTGVuZ3RoID0gbWluKG51bUJ5dGVzUGx1Z2luQ2Fu SGFuZGxlLCBudW1CeXRlc1RvRGVsaXZlciAtIG51bUJ5dGVzRGVsaXZlcmVkKTsKKyAgICAgICAg Y2hhciogZGF0YSA9IG1fZGVsaXZlcnlEYXRhLT5kYXRhKCkgKyBudW1CeXRlc0RlbGl2ZXJlZDsK KworICAgICAgICBpbnQzMl90IG51bUJ5dGVzV3JpdHRlbiA9IG1fcGx1Z2luLT5OUFBfV3JpdGUo Jm1fbnBTdHJlYW0sIG1fb2Zmc2V0LCBkYXRhTGVuZ3RoLCBkYXRhKTsKKyAgICAgICAgaWYgKG51 bUJ5dGVzV3JpdHRlbiA8IDApIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBEZXN0cm95IHRoZSBz dHJlYW0hCisgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgfQorCisg ICAgICAgIG51bUJ5dGVzV3JpdHRlbiA9IG1pbihudW1CeXRlc1dyaXR0ZW4sIGRhdGFMZW5ndGgp OworICAgICAgICBtX29mZnNldCArPSBudW1CeXRlc1dyaXR0ZW47CisgICAgICAgIG51bUJ5dGVz RGVsaXZlcmVkICs9IG51bUJ5dGVzV3JpdHRlbjsKKyAgICB9CisKKyAgICAvLyBXZSBkaWRuJ3Qg d3JpdGUgYW55dGhpbmcuCisgICAgaWYgKCFudW1CeXRlc0RlbGl2ZXJlZCkKKyAgICAgICAgcmV0 dXJuOworCisgICAgaWYgKG51bUJ5dGVzRGVsaXZlcmVkIDwgbnVtQnl0ZXNUb0RlbGl2ZXIpIHsK KyAgICAgICAgLy8gUmVtb3ZlIHRoZSBieXRlcyB0aGF0IHdlIGFjdHVhbGx5IGRlbGl2ZXJlZC4K KyAgICAgICAgbV9kZWxpdmVyeURhdGEtPnJlbW92ZSgwLCBudW1CeXRlc0RlbGl2ZXJlZCk7Cisg ICAgfSBlbHNlIHsKKyAgICAgICAgbV9kZWxpdmVyeURhdGEtPmNsZWFyKCk7CisKKyAgICAgICAg aWYgKG1fc3RvcFN0cmVhbVdoZW5Eb25lRGVsaXZlcmluZykKKyAgICAgICAgICAgIHN0b3AoTlBS RVNfRE9ORSk7CisgICAgfQorfQorCiB2b2lkIE5ldHNjYXBlUGx1Z2luU3RyZWFtOjpzdG9wKE5Q UmVhc29uIHJlYXNvbikKIHsKICAgICBpZiAobV9pc1N0YXJ0ZWQpIHsKKyAgICAgICAgaWYgKHJl YXNvbiA9PSBOUFJFU19ET05FICYmIG1fZGVsaXZlcnlEYXRhICYmICFtX2RlbGl2ZXJ5RGF0YS0+ aXNFbXB0eSgpKSB7CisgICAgICAgICAgICAvLyBUaGVyZSBpcyBzdGlsbCBkYXRhIGxlZnQgdGhh dCB0aGUgcGx1Zy1pbiBoYXNuJ3QgYmVlbiBhYmxlIHRvIGNvbnN1bWUgeWV0LgorICAgICAgICAg ICAgQVNTRVJUKG1fZGVsaXZlcnlEYXRhVGltZXIuaXNBY3RpdmUoKSk7CisgICAgICAgICAgICAK KyAgICAgICAgICAgIC8vIFNldCBtX3N0b3BTdHJlYW1XaGVuRG9uZURlbGl2ZXJpbmcgdG8gdHJ1 ZSBzbyB0aGF0IHRoZSBuZXh0IHRpbWUgdGhlIGRlbGl2ZXJ5IHRpbWVyIGZpcmVzCisgICAgICAg ICAgICAvLyBhbmQgY2FsbHMgZGVsaXZlckRhdGFUb1BsdWdpbiB0aGUgc3RyZWFtIHdpbGwgYmUg Y2xvc2VkIGlmIGFsbCB0aGUgcmVtYWluaW5nIGRhdGEgd2FzCisgICAgICAgICAgICAvLyBzdWNj ZXNzZnVsbHkgZGVsaXZlcmVkLgorICAgICAgICAgICAgbV9zdG9wU3RyZWFtV2hlbkRvbmVEZWxp dmVyaW5nID0gdHJ1ZTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAg IG1fZGVsaXZlcnlEYXRhID0gMDsKKyAgICAgICAgbV9kZWxpdmVyeURhdGFUaW1lci5zdG9wKCk7 CisKICAgICAgICAgbV9wbHVnaW4tPk5QUF9EZXN0cm95U3RyZWFtKCZtX25wU3RyZWFtLCByZWFz b24pOwogICAgICAgICBtX2lzU3RhcnRlZCA9IGZhbHNlOwogICAgIH0KIAorICAgIEFTU0VSVCgh bV9kZWxpdmVyeURhdGFUaW1lci5pc0FjdGl2ZSgpKTsKKwogICAgIGlmIChtX3NlbmROb3RpZmlj YXRpb24pCiAgICAgICAgIG1fcGx1Z2luLT5OUFBfVVJMTm90aWZ5KG1fcmVzcG9uc2VVUkwuZGF0 YSgpLCByZWFzb24sIG1fbm90aWZpY2F0aW9uRGF0YSk7CiAKQEAgLTExNSw0ICsxOTksMyBAQCB2 b2lkIE5ldHNjYXBlUGx1Z2luU3RyZWFtOjpzdG9wKE5QUmVhc29uIHJlYXNvbikKIH0KIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0Ci0KZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVn aW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmggYi9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5oCmluZGV4IGUwMmQ3MDcwZTU1 MGUzZjU4NWE5NDNlOTRjMDc1ZTZkYWExMWQxZjguLmY5N2RiZjI3MjdlNGM4MWUzZGU1NjhlYTJj MjVkMTlhYjllMjdjZjkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uaApAQCAtMjYsNiArMjYsNyBAQAog I2lmbmRlZiBOZXRzY2FwZVBsdWdpblN0cmVhbV9oCiAjZGVmaW5lIE5ldHNjYXBlUGx1Z2luU3Ry ZWFtX2gKIAorI2luY2x1ZGUgIlJ1bkxvb3AuaCIKICNpbmNsdWRlIDxXZWJDb3JlL25wYXBpLmg+ CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5o PgpAQCAtNTksNiArNjAsOSBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgdWludDMyX3QgbGFz dE1vZGlmaWVkVGltZSwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgV2Vi Q29yZTo6U3RyaW5nJiBoZWFkZXJzKTsKICAgICB2b2lkIHN0b3AoTlBSZWFzb24pOwogCisgICAg dm9pZCBkZWxpdmVyRGF0YShjb25zdCBjaGFyKiBieXRlcywgaW50IGxlbmd0aCk7CisgICAgdm9p ZCBkZWxpdmVyRGF0YVRvUGx1Z2luKCk7CisKICAgICBSZWZQdHI8TmV0c2NhcGVQbHVnaW4+IG1f cGx1Z2luOwogICAgIHVpbnQ2NF90IG1fc3RyZWFtSUQ7CiAgICAgCkBAIC03NSw2ICs3OSwxMCBA QCBwcml2YXRlOgogICAgIENTdHJpbmcgbV9yZXNwb25zZVVSTDsKICAgICBDU3RyaW5nIG1fbWlt ZVR5cGU7CiAgICAgQ1N0cmluZyBtX2hlYWRlcnM7CisKKyAgICBSdW5Mb29wOjpUaW1lcjxOZXRz Y2FwZVBsdWdpblN0cmVhbT4gbV9kZWxpdmVyeURhdGFUaW1lcjsKKyAgICBPd25QdHI8IFZlY3Rv cjxjaGFyPiA+IG1fZGVsaXZlcnlEYXRhOworICAgIGJvb2wgbV9zdG9wU3RyZWFtV2hlbkRvbmVE ZWxpdmVyaW5nOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==