144363 2015-04-28 16:34:07 -0700 [Content Extensions] Process NFAs individually to avoid having all NFAs live at the same time 2015-04-28 17:23:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam achristensen oldest_to_newest 1089788 0 sam 2015-04-28 16:34:07 -0700 [Content Extensions] Process NFAs individually to avoid having all NFAs live at the same time 1089792 1 251896 sam 2015-04-28 16:48:58 -0700 Created attachment 251896 Patch 1089798 2 sam 2015-04-28 17:23:44 -0700 Committed r183518: <http://trac.webkit.org/changeset/183518> 251896 2015-04-28 16:48:58 -0700 2015-04-28 16:54:02 -0700 Patch bug-144363-20150428164749.patch text/plain 11087 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MzUxNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA0LTI4ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NvbnRlbnQgRXh0ZW5zaW9uc10gUHJv Y2VzcyBORkFzIGluZGl2aWR1YWxseSB0byBhdm9pZCBoYXZpbmcgYWxsIE5GQXMgbGl2ZSBhdCB0 aGUgc2FtZSB0aW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDQzNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaGlzIGJyaW5ncyBkaXJ0eSBtZW1vcnkgdXNlIHdoZW4gY29tcGlsaW5nIG91ciB0ZXN0 IGNvbnRlbnQgZXh0ZW5zaW9uIGRvd24gZnJvbSB+MzAwTUIgdG8gfjEwME1CLgorCisgICAgICAg ICogY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRVUkxGaWx0ZXJzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpDb21iaW5lZFVSTEZpbHRlcnM6OnByb2Nlc3NORkFz KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpDb21iaW5lZFVSTEZpbHRl cnM6OmNyZWF0ZU5GQXMpOiBEZWxldGVkLgorICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL0Nv bWJpbmVkVVJMRmlsdGVycy5oOgorICAgICAgICBSZXBsYWNlIGZ1bmN0aW9uIHRoYXQgY3JlYXRl cyBhIFZlY3RvciBvZiBhbGwgdGhlIE5GQXMgd2l0aCBvbmUgdGhhdCBhbGxvd3MgaW5jcmVtZW50 YWwgcHJvY2Vzc2luZworICAgICAgICBhcyB0aGV5IGFyZSBjcmVhdGVkLgorCisgICAgICAgICog Y29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbkNvbXBpbGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjphZGRVbml2ZXJzYWxBY3Rpb25zVG9ERkEpOgor ICAgICAgICBFeHRyYWN0IGNvZGUgdG8gYWRkIHVuaXZlcnNhbCBhY3Rpb25zIGludG8gYSBoZWxw ZXIsIHNpbmNlIHdlIG5lZWQgdG8gY2FsbCBpdCBpbiB0d28gcGxhY2VzIG5vdy4KKworICAgICAg ICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6OmNvbXBpbGVSdWxlTGlzdCk6CisgICAgICAg IEFkb3B0IENvbWJpbmVkVVJMRmlsdGVyczo6cHJvY2Vzc05GQXMuIE5vdyB0aGF0IHdlIGRvbid0 IGhhdmUgYSBWZWN0b3Igb2YgTkZBcywgd2UgbmVlZCB0byBrZWVwIHRyYWNrCisgICAgICAgIG9m IHdoZXRoZXIgb3Igbm90IGFueSBORkFzIHdlcmUgcHJvY2Vzc2VkIGFuZCBpZiB3ZSBhcmUgY3Vy cmVudGx5IHByb2Nlc3NpbmcgdGhlIGZpcnN0IE5GQSBzbyB3ZSBjYW4KKyAgICAgICAgZW5zdXJl IHRoYXQgd2UgaGF2ZSBzb21lIGJ5dGVjb2RlIGdlbmVyYXRlZCBldmVudCBmb3IgZW1wdHkgcnVs ZSBzZXRzLCBhbmQgdGhhdCB1bml2ZXJzYWwgYWN0aW9ucyBhcmUKKyAgICAgICAgcGxhY2VkIG9u IHRoZSBmaXJzdCBERkEuCisKIDIwMTUtMDQtMjggIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9o b3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFtUZXh0SW5kaWNhdG9yXSBZZWxsb3cgaGlnaGxp Z2h0IHRha2VzIHRvbyBsb25nIHRvIGZhZGUgb3V0IG9uIHNjcm9sbApJbmRleDogU291cmNlL1dl YkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRVUkxGaWx0ZXJzLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db21iaW5lZFVSTEZpbHRlcnMu Y3BwCShyZXZpc2lvbiAxODM1MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9u cy9Db21iaW5lZFVSTEZpbHRlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjksMTMgKzE2OSwx MSBAQCBzdGF0aWMgdm9pZCBnZW5lcmF0ZU5GQUZvclN1YnRyZWUoTkZBJiBuCiAgICAgfQogfQog Ci1WZWN0b3I8TkZBPiBDb21iaW5lZFVSTEZpbHRlcnM6OmNyZWF0ZU5GQXMoKSBjb25zdAordm9p ZCBDb21iaW5lZFVSTEZpbHRlcnM6OnByb2Nlc3NORkFzKHN0ZDo6ZnVuY3Rpb248dm9pZChORkEm Jik+IGhhbmRsZXIpIGNvbnN0CiB7CiAgICAgVmVjdG9yPEFjdGl2ZVN1YnRyZWU+IGFjdGl2ZVN0 YWNrOwogICAgIGFjdGl2ZVN0YWNrLmFwcGVuZChBY3RpdmVTdWJ0cmVlKHsgbV9wcmVmaXhUcmVl Um9vdC5nZXQoKSwgbV9wcmVmaXhUcmVlUm9vdC0+ZWRnZXMuYmVnaW4oKSB9KSk7CiAKLSAgICBW ZWN0b3I8TkZBPiBuZmFzOwotCiAgICAgd2hpbGUgKHRydWUpIHsKICAgICBQcm9jZXNzU3VidHJl ZToKICAgICAgICAgQWN0aXZlU3VidHJlZSYgYWN0aXZlU3VidHJlZSA9IGFjdGl2ZVN0YWNrLmxh c3QoKTsKQEAgLTIwMiwyMyArMjAwLDI0IEBAIFZlY3RvcjxORkE+IENvbWJpbmVkVVJMRmlsdGVy czo6Y3JlYXRlTkYKICAgICAgICAgfQogCiAgICAgICAgIGlmIChuZWVkVG9HZW5lcmF0ZSkgewot ICAgICAgICAgICAgbmZhcy5hcHBlbmQoTkZBKCkpOwotICAgICAgICAgICAgTkZBJiBnZW5lcmF0 aW5nTkZBID0gbmZhcy5sYXN0KCk7CisgICAgICAgICAgICBORkEgbmZhOwogCi0gICAgICAgICAg ICB1bnNpZ25lZCBwcmVmaXhFbmQgPSBnZW5lcmF0aW5nTkZBLnJvb3QoKTsKKyAgICAgICAgICAg IHVuc2lnbmVkIHByZWZpeEVuZCA9IG5mYS5yb290KCk7CiAKICAgICAgICAgICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBhY3RpdmVTdGFjay5zaXplKCkgLSAxOyArK2kpIHsKICAgICAgICAg ICAgICAgICBjb25zdCBUZXJtJiB0ZXJtID0gYWN0aXZlU3RhY2tbaV0uaXRlcmF0b3ItPmZpcnN0 OwotICAgICAgICAgICAgICAgIHByZWZpeEVuZCA9IHRlcm0uZ2VuZXJhdGVHcmFwaChnZW5lcmF0 aW5nTkZBLCBwcmVmaXhFbmQsIGFjdGl2ZVN0YWNrW2ldLml0ZXJhdG9yLT5zZWNvbmQtPmZpbmFs QWN0aW9ucyk7CisgICAgICAgICAgICAgICAgcHJlZml4RW5kID0gdGVybS5nZW5lcmF0ZUdyYXBo KG5mYSwgcHJlZml4RW5kLCBhY3RpdmVTdGFja1tpXS5pdGVyYXRvci0+c2Vjb25kLT5maW5hbEFj dGlvbnMpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGVk Z2UgOiBhY3RpdmVTdWJ0cmVlLnZlcnRleC0+ZWRnZXMpIHsKICAgICAgICAgICAgICAgICBpZiAo IWVkZ2Uuc2Vjb25kLT5pblZhcmlhYmxlTGVuZ3RoUHJlZml4KSB7CiAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IFRlcm0mIHRlcm0gPSBlZGdlLmZpcnN0OwotICAgICAgICAgICAgICAgICAgICB1 bnNpZ25lZCBuZXdTdWJ0cmVlU3RhcnQgPSB0ZXJtLmdlbmVyYXRlR3JhcGgoZ2VuZXJhdGluZ05G QSwgcHJlZml4RW5kLCBlZGdlLnNlY29uZC0+ZmluYWxBY3Rpb25zKTsKLSAgICAgICAgICAgICAg ICAgICAgZ2VuZXJhdGVORkFGb3JTdWJ0cmVlKGdlbmVyYXRpbmdORkEsIG5ld1N1YnRyZWVTdGFy dCwgKmVkZ2Uuc2Vjb25kKTsKKyAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgbmV3U3VidHJl ZVN0YXJ0ID0gdGVybS5nZW5lcmF0ZUdyYXBoKG5mYSwgcHJlZml4RW5kLCBlZGdlLnNlY29uZC0+ ZmluYWxBY3Rpb25zKTsKKyAgICAgICAgICAgICAgICAgICAgZ2VuZXJhdGVORkFGb3JTdWJ0cmVl KG5mYSwgbmV3U3VidHJlZVN0YXJ0LCAqZWRnZS5zZWNvbmQpOwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICAgICAgaGFuZGxlcihXVEY6Om1v dmUobmZhKSk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBXZSBoYXZlIHByb2Nlc3NlZCBhbGwg dGhlIHN1YnRyZWVzIG9mIHRoaXMgbGV2ZWwsIHBvcCB0aGUgc3RhY2sgYW5kIG1vdmUgb24gdG8g dGhlIG5leHQgc2libGluZy4KQEAgLTIyNyw4ICsyMjYsNiBAQCBWZWN0b3I8TkZBPiBDb21iaW5l ZFVSTEZpbHRlcnM6OmNyZWF0ZU5GCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgKythY3Rp dmVTdGFjay5sYXN0KCkuaXRlcmF0b3I7CiAgICAgfQotCi0gICAgcmV0dXJuIG5mYXM7CiB9CiAK IH0gLy8gbmFtZXNwYWNlIENvbnRlbnRFeHRlbnNpb25zCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9j b250ZW50ZXh0ZW5zaW9ucy9Db21iaW5lZFVSTEZpbHRlcnMuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9Db21iaW5lZFVSTEZpbHRlcnMuaAkocmV2aXNp b24gMTgzNTA3KQorKysgU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29tYmluZWRV UkxGaWx0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTQyLDkgKzQyLDEwIEBAIGNsYXNzIFdFQkNP UkVfRVhQT1JUIENvbWJpbmVkVVJMRmlsdGVycyAKIHB1YmxpYzoKICAgICBDb21iaW5lZFVSTEZp bHRlcnMoKTsKICAgICB+Q29tYmluZWRVUkxGaWx0ZXJzKCk7CisKICAgICB2b2lkIGFkZFBhdHRl cm4odWludDY0X3QgcGF0dGVybklkLCBjb25zdCBWZWN0b3I8VGVybT4mIHBhdHRlcm4pOwogCi0g ICAgVmVjdG9yPE5GQT4gY3JlYXRlTkZBcygpIGNvbnN0OworICAgIHZvaWQgcHJvY2Vzc05GQXMo c3RkOjpmdW5jdGlvbjx2b2lkKE5GQSYmKT4gaGFuZGxlcikgY29uc3Q7CiAgICAgdm9pZCBjbGVh cigpOwogCiAgICAgc2l6ZV90IG1lbW9yeVVzZWQoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2NvbnRlbnRleHRlbnNpb25zL0NvbnRlbnRFeHRlbnNpb25Db21waWxlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lv bkNvbXBpbGVyLmNwcAkocmV2aXNpb24gMTgzNTA3KQorKysgU291cmNlL1dlYkNvcmUvY29udGVu dGV4dGVuc2lvbnMvQ29udGVudEV4dGVuc2lvbkNvbXBpbGVyLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMTE5LDYgKzExOSwyMiBAQCBzdGF0aWMgVmVjdG9yPHVuc2lnbmVkPiBzZXJpYWxpemVBY3Rp b25zCiAgICAgcmV0dXJuIGFjdGlvbkxvY2F0aW9uczsKIH0KIAordHlwZWRlZiBIYXNoU2V0PHVp bnQ2NF90LCBEZWZhdWx0SGFzaDx1aW50NjRfdD46Okhhc2gsIFdURjo6VW5zaWduZWRXaXRoWmVy b0tleUhhc2hUcmFpdHM8dWludDY0X3Q+PiBVbml2ZXJzYWxBY3Rpb25Mb2NhdGlvbnNTZXQ7CisK K3N0YXRpYyB2b2lkIGFkZFVuaXZlcnNhbEFjdGlvbnNUb0RGQShERkEmIGRmYSwgY29uc3QgVW5p dmVyc2FsQWN0aW9uTG9jYXRpb25zU2V0JiB1bml2ZXJzYWxBY3Rpb25Mb2NhdGlvbnMpCit7Cisg ICAgaWYgKHVuaXZlcnNhbEFjdGlvbkxvY2F0aW9ucy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVy bjsKKworICAgIHVuc2lnbmVkIGFjdGlvbnNTdGFydCA9IGRmYS5hY3Rpb25zLnNpemUoKTsKKyAg ICBkZmEuYWN0aW9ucy5yZXNlcnZlQ2FwYWNpdHkoZGZhLmFjdGlvbnMuc2l6ZSgpICsgdW5pdmVy c2FsQWN0aW9uTG9jYXRpb25zLnNpemUoKSk7CisgICAgZm9yICh1aW50NjRfdCBhY3Rpb25Mb2Nh dGlvbiA6IHVuaXZlcnNhbEFjdGlvbkxvY2F0aW9ucykKKyAgICAgICAgZGZhLmFjdGlvbnMudW5j aGVja2VkQXBwZW5kKGFjdGlvbkxvY2F0aW9uKTsKKyAgICB1bnNpZ25lZCBhY3Rpb25zRW5kID0g ZGZhLmFjdGlvbnMuc2l6ZSgpOworICAgIHVuc2lnbmVkIGFjdGlvbnNMZW5ndGggPSBhY3Rpb25z RW5kIC0gYWN0aW9uc1N0YXJ0OworICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfTUVTU0FHRShhY3Rp b25zTGVuZ3RoIDwgc3RkOjpudW1lcmljX2xpbWl0czx1aW50MTZfdD46Om1heCgpLCAiVG9vIG1h bnkgdW5jb21iaW5lZCBhY3Rpb25zIHRoYXQgbWF0Y2ggZXZlcnl0aGluZyIpOworICAgIGRmYS5u b2Rlc1tkZmEucm9vdF0uc2V0QWN0aW9ucyhhY3Rpb25zU3RhcnQsIHN0YXRpY19jYXN0PHVpbnQx Nl90PihhY3Rpb25zTGVuZ3RoKSk7Cit9CiAKIHN0ZDo6ZXJyb3JfY29kZSBjb21waWxlUnVsZUxp c3QoQ29udGVudEV4dGVuc2lvbkNvbXBpbGF0aW9uQ2xpZW50JiBjbGllbnQsIGNvbnN0IFN0cmlu ZyYgcnVsZUxpc3QpCiB7CkBAIC0xMzcsNyArMTUzLDcgQEAgc3RkOjplcnJvcl9jb2RlIGNvbXBp bGVSdWxlTGlzdChDb250ZW50RQogICAgIExPR19MQVJHRV9TVFJVQ1RVUkVTKGFjdGlvbnMsIGFj dGlvbnMuY2FwYWNpdHkoKSAqIHNpemVvZihTZXJpYWxpemVkQWN0aW9uQnl0ZSkpOwogICAgIGFj dGlvbnMuY2xlYXIoKTsKIAotICAgIEhhc2hTZXQ8dWludDY0X3QsIERlZmF1bHRIYXNoPHVpbnQ2 NF90Pjo6SGFzaCwgV1RGOjpVbnNpZ25lZFdpdGhaZXJvS2V5SGFzaFRyYWl0czx1aW50NjRfdD4+ IHVuaXZlcnNhbEFjdGlvbkxvY2F0aW9uczsKKyAgICBVbml2ZXJzYWxBY3Rpb25Mb2NhdGlvbnNT ZXQgdW5pdmVyc2FsQWN0aW9uTG9jYXRpb25zOwogCiAgICAgQ29tYmluZWRVUkxGaWx0ZXJzIGNv bWJpbmVkVVJMRmlsdGVyczsKICAgICBVUkxGaWx0ZXJQYXJzZXIgdXJsRmlsdGVyUGFyc2VyKGNv bWJpbmVkVVJMRmlsdGVycyk7CkBAIC0xNzUsNDAgKzE5MSwyNyBAQCBzdGQ6OmVycm9yX2NvZGUg Y29tcGlsZVJ1bGVMaXN0KENvbnRlbnRFCiAgICAgZGF0YUxvZ0YoIiAgICBUaW1lIHNwZW50IHBh cnRpdGlvbmluZyB0aGUgcnVsZXMgaW50byBncm91cHM6ICVmXG4iLCAocGF0dGVyblBhcnRpdGlv bmluZ0VuZCAtIHBhdHRlcm5QYXJ0aXRpb25pbmdTdGFydCkpOwogI2VuZGlmCiAKLSNpZiBDT05U RU5UX0VYVEVOU0lPTlNfUEVSRk9STUFOQ0VfUkVQT1JUSU5HCi0gICAgZG91YmxlIG5mYUJ1aWxk VGltZVN0YXJ0ID0gbW9ub3RvbmljYWxseUluY3JlYXNpbmdUaW1lKCk7Ci0jZW5kaWYKLQotICAg IFZlY3RvcjxORkE+IG5mYXMgPSBjb21iaW5lZFVSTEZpbHRlcnMuY3JlYXRlTkZBcygpOwogICAg IExPR19MQVJHRV9TVFJVQ1RVUkVTKGNvbWJpbmVkVVJMRmlsdGVycywgY29tYmluZWRVUkxGaWx0 ZXJzLm1lbW9yeVVzZWQoKSk7Ci0gICAgY29tYmluZWRVUkxGaWx0ZXJzLmNsZWFyKCk7Ci0gICAg aWYgKCFuZmFzLnNpemUoKSAmJiB1bml2ZXJzYWxBY3Rpb25Mb2NhdGlvbnMuc2l6ZSgpKQotICAg ICAgICBuZmFzLmFwcGVuZChORkEoKSk7CiAKICNpZiBDT05URU5UX0VYVEVOU0lPTlNfUEVSRk9S TUFOQ0VfUkVQT1JUSU5HCi0gICAgZG91YmxlIG5mYUJ1aWxkVGltZUVuZCA9IG1vbm90b25pY2Fs bHlJbmNyZWFzaW5nVGltZSgpOwotICAgIGRhdGFMb2dGKCIgICAgVGltZSBzcGVudCBidWlsZGlu ZyB0aGUgTkZBczogJWZcbiIsIChuZmFCdWlsZFRpbWVFbmQgLSBuZmFCdWlsZFRpbWVTdGFydCkp OworICAgIGRvdWJsZSB0b3RhbE5GQVRvQnl0ZUNvZGVCdWlsZFRpbWVTdGFydCA9IG1vbm90b25p Y2FsbHlJbmNyZWFzaW5nVGltZSgpOwogI2VuZGlmCiAKKyAgICBWZWN0b3I8REZBQnl0ZWNvZGU+ IGJ5dGVjb2RlOworICAgIGJvb2wgZmlyc3RORkFTZWVuID0gZmFsc2U7CisgICAgY29tYmluZWRV UkxGaWx0ZXJzLnByb2Nlc3NORkFzKFsmXShORkEmJiBuZmEpIHsKICNpZiBDT05URU5UX0VYVEVO U0lPTlNfU1RBVEVfTUFDSElORV9ERUJVR0dJTkcKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IG5mYXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgV1RGTG9nQWx3YXlzKCJORkEgJXp1IiwgaSk7 Ci0gICAgICAgIGNvbnN0IE5GQSYgbmZhID0gbmZhc1tpXTsKICAgICAgICAgbmZhLmRlYnVnUHJp bnREb3QoKTsKLSAgICB9CiAjZW5kaWYKIAotI2lmIENPTlRFTlRfRVhURU5TSU9OU19QRVJGT1JN QU5DRV9SRVBPUlRJTkcKLSAgICBkb3VibGUgdG90YWxORkFUb0J5dGVDb2RlQnVpbGRUaW1lU3Rh cnQgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsKLSNlbmRpZgorICAgICAgICBMT0df TEFSR0VfU1RSVUNUVVJFUyhuZmEsIG5mYS5tZW1vcnlVc2VkKCkpOwogCi0gICAgVmVjdG9yPERG QUJ5dGVjb2RlPiBieXRlY29kZTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG5mYXMuc2l6 ZSgpOyArK2kpIHsKICNpZiBDT05URU5UX0VYVEVOU0lPTlNfUEVSRk9STUFOQ0VfUkVQT1JUSU5H CiAgICAgICAgIGRvdWJsZSBkZmFCdWlsZFRpbWVTdGFydCA9IG1vbm90b25pY2FsbHlJbmNyZWFz aW5nVGltZSgpOwogI2VuZGlmCi0gICAgICAgIERGQSBkZmEgPSBORkFUb0RGQTo6Y29udmVydChu ZmFzW2ldKTsKKyAgICAgICAgREZBIGRmYSA9IE5GQVRvREZBOjpjb252ZXJ0KG5mYSk7CiAgICAg ICAgIExPR19MQVJHRV9TVFJVQ1RVUkVTKGRmYSwgZGZhLm1lbW9yeVVzZWQoKSk7CisKICNpZiBD T05URU5UX0VYVEVOU0lPTlNfUEVSRk9STUFOQ0VfUkVQT1JUSU5HCiAgICAgICAgIGRvdWJsZSBk ZmFCdWlsZFRpbWVFbmQgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsKICAgICAgICAg ZGF0YUxvZ0YoIiAgICBUaW1lIHNwZW50IGJ1aWxkaW5nIHRoZSBERkEgJXp1OiAlZlxuIiwgaSwg KGRmYUJ1aWxkVGltZUVuZCAtIGRmYUJ1aWxkVGltZVN0YXJ0KSk7CkBAIC0yMjgsMjAgKzIzMSwz NCBAQCBzdGQ6OmVycm9yX2NvZGUgY29tcGlsZVJ1bGVMaXN0KENvbnRlbnRFCiAgICAgICAgIGRm YS5kZWJ1Z1ByaW50RG90KCk7CiAjZW5kaWYKICAgICAgICAgQVNTRVJUX1dJVEhfTUVTU0FHRSgh ZGZhLm5vZGVzW2RmYS5yb290XS5oYXNBY3Rpb25zKCksICJBbGwgYWN0aW9ucyBvbiB0aGUgREZB IHJvb3Qgc2hvdWxkIGNvbWUgZnJvbSByZWd1bGFyIGV4cHJlc3Npb25zIHRoYXQgbWF0Y2ggZXZl cnl0aGluZy4iKTsKLSAgICAgICAgaWYgKCFpKSB7CisKKyAgICAgICAgaWYgKCFmaXJzdE5GQVNl ZW4pIHsKICAgICAgICAgICAgIC8vIFB1dCBhbGwgdGhlIHVuaXZlcnNhbCBhY3Rpb25zIG9uIHRo ZSBmaXJzdCBERkEuCi0gICAgICAgICAgICB1bnNpZ25lZCBhY3Rpb25zU3RhcnQgPSBkZmEuYWN0 aW9ucy5zaXplKCk7Ci0gICAgICAgICAgICBkZmEuYWN0aW9ucy5yZXNlcnZlQ2FwYWNpdHkoZGZh LmFjdGlvbnMuc2l6ZSgpICsgdW5pdmVyc2FsQWN0aW9uTG9jYXRpb25zLnNpemUoKSk7Ci0gICAg ICAgICAgICBmb3IgKHVpbnQ2NF90IGFjdGlvbkxvY2F0aW9uIDogdW5pdmVyc2FsQWN0aW9uTG9j YXRpb25zKQotICAgICAgICAgICAgICAgIGRmYS5hY3Rpb25zLnVuY2hlY2tlZEFwcGVuZChhY3Rp b25Mb2NhdGlvbik7Ci0gICAgICAgICAgICB1bnNpZ25lZCBhY3Rpb25zRW5kID0gZGZhLmFjdGlv bnMuc2l6ZSgpOwotICAgICAgICAgICAgdW5zaWduZWQgYWN0aW9uc0xlbmd0aCA9IGFjdGlvbnNF bmQgLSBhY3Rpb25zU3RhcnQ7Ci0gICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9XSVRIX01FU1NB R0UoYWN0aW9uc0xlbmd0aCA8IHN0ZDo6bnVtZXJpY19saW1pdHM8dWludDE2X3Q+OjptYXgoKSwg IlRvbyBtYW55IHVuY29tYmluZWQgYWN0aW9ucyB0aGF0IG1hdGNoIGV2ZXJ5dGhpbmciKTsKLSAg ICAgICAgICAgIGRmYS5ub2Rlc1tkZmEucm9vdF0uc2V0QWN0aW9ucyhhY3Rpb25zU3RhcnQsIHN0 YXRpY19jYXN0PHVpbnQxNl90PihhY3Rpb25zTGVuZ3RoKSk7CisgICAgICAgICAgICBhZGRVbml2 ZXJzYWxBY3Rpb25zVG9ERkEoZGZhLCB1bml2ZXJzYWxBY3Rpb25Mb2NhdGlvbnMpOwogICAgICAg ICB9CisKICAgICAgICAgREZBQnl0ZWNvZGVDb21waWxlciBjb21waWxlcihkZmEsIGJ5dGVjb2Rl KTsKICAgICAgICAgY29tcGlsZXIuY29tcGlsZSgpOworCisgICAgICAgIGZpcnN0TkZBU2VlbiA9 IHRydWU7CisgICAgfSk7CisKKyAgICBpZiAoIWZpcnN0TkZBU2VlbikgeworICAgICAgICAvLyBP dXIgYnl0ZWNvZGUgaW50ZXJwcmV0ZXIgZXhwZWN0cyB0byBoYXZlIGF0IGxlYXN0IG9uZSBERkEs IHNvIGlmIHdlIGhhdmVuJ3Qgc2VlbiBhbnkKKyAgICAgICAgLy8gY3JlYXRlIGEgZHVtbXkgb25l IGFuZCBhZGQgYW55IHVuaXZlcnNhbCBhY3Rpb25zLgorCisgICAgICAgIE5GQSBkdW1teU5GQTsK KyAgICAgICAgREZBIGR1bW15REZBID0gTkZBVG9ERkE6OmNvbnZlcnQoZHVtbXlORkEpOworCisg ICAgICAgIGFkZFVuaXZlcnNhbEFjdGlvbnNUb0RGQShkdW1teURGQSwgdW5pdmVyc2FsQWN0aW9u TG9jYXRpb25zKTsKKworICAgICAgICBERkFCeXRlY29kZUNvbXBpbGVyIGNvbXBpbGVyKGR1bW15 REZBLCBieXRlY29kZSk7CisgICAgICAgIGNvbXBpbGVyLmNvbXBpbGUoKTsKICAgICB9CisKKyAg ICAvLyBGSVhNRTogY29tYmluZWRVUkxGaWx0ZXJzIHNob3VsZCBiZSBjbGVhcmVkIGluY3JlbWVu dGFsbHkgYXMgaXQgaXMgcHJvY2Vzc2luZyBORkFzLiAKKyAgICBjb21iaW5lZFVSTEZpbHRlcnMu Y2xlYXIoKTsKKwogICAgIExPR19MQVJHRV9TVFJVQ1RVUkVTKHVuaXZlcnNhbEFjdGlvbkxvY2F0 aW9ucywgdW5pdmVyc2FsQWN0aW9uTG9jYXRpb25zLmNhcGFjaXR5KCkgKiBzaXplb2YodW5zaWdu ZWQpKTsKICAgICB1bml2ZXJzYWxBY3Rpb25Mb2NhdGlvbnMuY2xlYXIoKTsKIApAQCAtMjUxLDEx ICsyNjgsNiBAQCBzdGQ6OmVycm9yX2NvZGUgY29tcGlsZVJ1bGVMaXN0KENvbnRlbnRFCiAgICAg ZGF0YUxvZ0YoIiAgICBCeXRlY29kZSBzaXplICV6dVxuIiwgYnl0ZWNvZGUuc2l6ZSgpKTsKICAg ICBkYXRhTG9nRigiICAgIERGQSBjb3VudCAlenVcbiIsIG5mYXMuc2l6ZSgpKTsKICNlbmRpZgot ICAgIHNpemVfdCBuZmFNZW1vcnlVc2VkID0gMDsKLSAgICBmb3IgKGNvbnN0IE5GQSYgbmZhIDog bmZhcykKLSAgICAgICAgbmZhTWVtb3J5VXNlZCArPSBzaXplb2YoTkZBKSArIG5mYS5tZW1vcnlV c2VkKCk7Ci0gICAgTE9HX0xBUkdFX1NUUlVDVFVSRVMobmZhcywgbmZhTWVtb3J5VXNlZCk7Ci0g ICAgbmZhcy5jbGVhcigpOwogCiAgICAgTE9HX0xBUkdFX1NUUlVDVFVSRVMoYnl0ZWNvZGUsIGJ5 dGVjb2RlLmNhcGFjaXR5KCkgKiBzaXplb2YodWludDhfdCkpOwogICAgIGNsaWVudC53cml0ZUJ5 dGVjb2RlKFdURjo6bW92ZShieXRlY29kZSkpOwo=