104606 2012-12-10 15:34:19 -0800 [WK2] Add a user default to limit the number of web processes 2012-12-10 23:34:04 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap mjs sam webkit.review.bot oldest_to_newest 787782 0 ap 2012-12-10 15:34:19 -0800 Add a user default to limit the number of web processes, defaulting to unlimited. 787795 1 178655 ap 2012-12-10 15:47:12 -0800 Created attachment 178655 proposed patch 788079 2 178655 webkit.review.bot 2012-12-10 23:34:00 -0800 Comment on attachment 178655 proposed patch Clearing flags on attachment: 178655 Committed r137255: <http://trac.webkit.org/changeset/137255> 788080 3 webkit.review.bot 2012-12-10 23:34:04 -0800 All reviewed patches have been landed. Closing bug. 178655 2012-12-10 15:47:12 -0800 2012-12-10 23:34:00 -0800 proposed patch LimitProcesses.txt text/plain 11674 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNzIxNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDEyLTEyLTEwICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEFkZCBhIHVzZXIg ZGVmYXVsdCB0byBsaW1pdCB0aGUgbnVtYmVyIG9mIHdlYiBwcm9jZXNzZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDYwNgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGxpbWl0IGlzIHJl YWNoZWQsIHdlJ2xsIHJldXNlIGFuIGV4aXN0aW5nIHByb2Nlc3Mgd2l0aCBmZXdlc3QgcGFnZXMu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkNvbnRleHQ6OldlYkNvbnRleHQpOiBJbml0aWFsaXplIG1fd2ViUHJvY2Vzc0NvdW50TGlt aXQuCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZSk6IEFk ZGVkIGEgaG9vayBmb3IgcmVhZGluZyB0aGUgcHJlZmVyZW5jZSwKKyAgICAgICAgZW1wdHkgaW1w bGVtZW50YXRpb24gb24gbW9zdCBwbGF0Zm9ybXMuCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHQ6OmNyZWF0ZU5ld1dlYlByb2Nlc3MpOiBDaGFuZ2VkIHRvIHJldHVybiBhIHJhdyBwb2ludGVy LiBUaGUgbmV3CisgICAgICAgIHByb2Nlc3MgaXMgcHV0IGludG8gYSB2ZWN0b3IgYW55d2F5LCBz byB0aGVyZSBpcyBubyBvd25lcnNoaXAgdHJhbnNmZXIuCisgICAgICAgIChXZWJLaXQ6OldlYkNv bnRleHQ6Ondhcm1Jbml0aWFsUHJvY2Vzcyk6IERvbid0IGNyZWF0ZSBhIG5ldyBwcm9jZXNzIGlm IHRoYXQgd291bGQKKyAgICAgICAgZXhjZWVkIHRoZSBsaW1pdC4KKyAgICAgICAgKFdlYktpdDo6 V2ViQ29udGV4dDo6Y3JlYXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1p dCk6IEFkZGVkIGEgbmV3CisgICAgICAgIGZ1bmN0aW9uIHRoYXQgd2l0aGVyIGNyZWF0ZXMgYSBu ZXcgcHJvY2Vzcywgb3IgcGlja3MgYW4gZXhpc3Rpbmcgb25lLgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0OjpjcmVhdGVXZWJQYWdlKTogQ2FsbCB0aGUgYWJvdmUgbmV3IGZ1bmN0aW9uIGlu c3RlYWQgb2YKKyAgICAgICAgdW5jb25kaXRpb25hbGx5IGNyZWF0aW5nIGEgcHJvY2Vzcy4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0Lmg6IGNyZWF0ZU5ld1dlYlByb2Nlc3MgaXMg bm8gcHJpdmF0ZS4gQWxsIGNsaWVudHMgc2hvdWxkCisgICAgICAgIHJlc3BlY3QgdGhlIHByb2Nl c3MgY291bnQgbGltaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDog KFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzcyk6CisgICAgICAgIFJl c3BlY3QgdGhlIHByb2Nlc3MgY291bnQgbGltaXQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1dlYkNvbnRleHRNYWMubW06CisgICAgICAgIChXZWJLaXQ6OnJlZ2lzdGVyVXNlckRlZmF1bHRz SWZOZWVkZWQpOiBSZWdpc3RlciB0aGUgbmV3IGRlZmF1bHQuCisgICAgICAgIChXZWJLaXQ6Oldl YkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZSk6IFJlYWQgdGhlIGRlZmF1bHQgaW50byBhIFdl YkNvbnRleHQKKyAgICAgICAgbWVtYmVyIHZhcmlhYmxlLgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKTogTW92ZWQgcmVnaXN0ZXJVc2Vy RGVmYXVsdHNJZk5lZWRlZCgpCisgICAgICAgIGZyb20gaGVyZSB0byBwbGF0Zm9ybUluaXRpYWxp emUoKSwgYXMgdGhhdCdzIGEgYmV0dGVyIHBsYWNlIGZvciBpdC4gQWxzbyBhZGRlZCBhCisgICAg ICAgIEZJWE1FIGZvciBhbiB1bnJlbGF0ZWQgaXNzdWUuCisKIDIwMTItMTItMTAgIEVkdWFyZG8g TGltYSBNaXRldiAgPGVsaW1hQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRXhwb3NlIEhp dFRlc3RSZXN1bHQ6OnNjcm9sbGJhcigpIGNvbmRpdGlvbiBpbiBBUEkKSW5kZXg6IFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHJldmlzaW9uIDEzNjk5NykKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIw LDYgKzEyMCw3IEBAIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0Kj4mIFdlYkNvbnRleHQ6OmEKIAog V2ViQ29udGV4dDo6V2ViQ29udGV4dChQcm9jZXNzTW9kZWwgcHJvY2Vzc01vZGVsLCBjb25zdCBT dHJpbmcmIGluamVjdGVkQnVuZGxlUGF0aCkKICAgICA6IG1fcHJvY2Vzc01vZGVsKHByb2Nlc3NN b2RlbCkKKyAgICAsIG1fd2ViUHJvY2Vzc0NvdW50TGltaXQoVUlOVF9NQVgpCiAgICAgLCBtX2hh dmVJbml0aWFsRW1wdHlQcm9jZXNzKGZhbHNlKQogICAgICwgbV9kZWZhdWx0UGFnZUdyb3VwKFdl YlBhZ2VHcm91cDo6Y3JlYXRlKCkpCiAgICAgLCBtX2luamVjdGVkQnVuZGxlUGF0aChpbmplY3Rl ZEJ1bmRsZVBhdGgpCkBAIC0xMzgsNiArMTM5LDggQEAgV2ViQ29udGV4dDo6V2ViQ29udGV4dChQ cm9jZXNzTW9kZWwgcHJvYwogICAgICwgbV91c2VzTmV0d29ya1Byb2Nlc3MoZmFsc2UpCiAjZW5k aWYKIHsKKyAgICBwbGF0Zm9ybUluaXRpYWxpemUoKTsKKwogICAgIGFkZE1lc3NhZ2VSZWNlaXZl cihNZXNzYWdlczo6V2ViQ29udGV4dDo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCB0aGlzKTsKICAg ICBhZGRNZXNzYWdlUmVjZWl2ZXIoQ29yZUlQQzo6TWVzc2FnZUtpbmRUcmFpdHM8V2ViQ29udGV4 dExlZ2FjeU1lc3NhZ2U6OktpbmQ+OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIHRoaXMpOwogCkBA IC0xODMsNiArMTg2LDEyIEBAIFdlYkNvbnRleHQ6OldlYkNvbnRleHQoUHJvY2Vzc01vZGVsIHBy b2MKICNlbmRpZgogfQogCisjaWYgIVBMQVRGT1JNKE1BQykKK3ZvaWQgV2ViQ29udGV4dDo6cGxh dGZvcm1Jbml0aWFsaXplKCkKK3sKK30KKyNlbmRpZgorCiBXZWJDb250ZXh0Ojp+V2ViQ29udGV4 dCgpCiB7CiAgICAgQVNTRVJUKGNvbnRleHRzKCkuZmluZCh0aGlzKSAhPSBub3RGb3VuZCk7CkBA IC0zODcsNyArMzk2LDcgQEAgV2ViUHJvY2Vzc1Byb3h5KiBXZWJDb250ZXh0OjplbnN1cmVTaGFy ZQogICAgIHJldHVybiBtX3Byb2Nlc3Nlc1swXS5nZXQoKTsKIH0KIAotUGFzc1JlZlB0cjxXZWJQ cm9jZXNzUHJveHk+IFdlYkNvbnRleHQ6OmNyZWF0ZU5ld1dlYlByb2Nlc3MoKQorV2ViUHJvY2Vz c1Byb3h5KiBXZWJDb250ZXh0OjpjcmVhdGVOZXdXZWJQcm9jZXNzKCkKIHsKICNpZiBFTkFCTEUo TkVUV09SS19QUk9DRVNTKQogICAgIGlmIChtX3VzZXNOZXR3b3JrUHJvY2VzcykKQEAgLTQ3OSw4 ICs0ODgsNyBAQCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gV2ViQ29udGV4dDo6CiAgICAg fSBlbHNlCiAgICAgICAgIEFTU0VSVChtX21lc3NhZ2VzVG9JbmplY3RlZEJ1bmRsZVBvc3RlZFRv RW1wdHlDb250ZXh0LmlzRW1wdHkoKSk7CiAKLQotICAgIHJldHVybiBwcm9jZXNzLnJlbGVhc2Uo KTsKKyAgICByZXR1cm4gcHJvY2Vzcy5nZXQoKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0Ojp3YXJt SW5pdGlhbFByb2Nlc3MoKSAgCkBAIC00OTAsNiArNDk4LDkgQEAgdm9pZCBXZWJDb250ZXh0Ojp3 YXJtSW5pdGlhbFByb2Nlc3MoKSAgCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBpZiAo bV9wcm9jZXNzZXMuc2l6ZSgpID49IG1fd2ViUHJvY2Vzc0NvdW50TGltaXQpCisgICAgICAgIHJl dHVybjsKKwogICAgIGNyZWF0ZU5ld1dlYlByb2Nlc3MoKTsKICAgICBtX2hhdmVJbml0aWFsRW1w dHlQcm9jZXNzID0gdHJ1ZTsKIH0KQEAgLTYxNCw2ICs2MjUsMjMgQEAgdm9pZCBXZWJDb250ZXh0 OjpkaXNjb25uZWN0UHJvY2VzcyhXZWJQcgogICAgIG1fcHJvY2Vzc2VzLnJlbW92ZShtX3Byb2Nl c3Nlcy5maW5kKHByb2Nlc3MpKTsKIH0KIAorV2ViUHJvY2Vzc1Byb3h5KiBXZWJDb250ZXh0Ojpj cmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KCkKK3sKKyAgICBp ZiAobV9wcm9jZXNzZXMuc2l6ZSgpIDwgbV93ZWJQcm9jZXNzQ291bnRMaW1pdCkKKyAgICAgICAg cmV0dXJuIGNyZWF0ZU5ld1dlYlByb2Nlc3MoKTsKKworICAgIC8vIENob29zZSBhIHByb2Nlc3Mg d2l0aCBmZXdlc3QgcGFnZXMsIHRvIGFjaGlldmUgZmxhdCBkaXN0cmlidXRpb24uCisgICAgV2Vi UHJvY2Vzc1Byb3h5KiByZXN1bHQgPSAwOworICAgIHVuc2lnbmVkIGZld2VzdFBhZ2VzU2VlbiA9 IFVJTlRfTUFYOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBtX3Byb2Nlc3Nlcy5zaXpl KCk7ICsraSkgeworICAgICAgICBpZiAoZmV3ZXN0UGFnZXNTZWVuID4gbV9wcm9jZXNzZXNbaV0t PnBhZ2VzKCkuc2l6ZSgpKSB7CisgICAgICAgICAgICByZXN1bHQgPSBtX3Byb2Nlc3Nlc1tpXS5n ZXQoKTsKKyAgICAgICAgICAgIGZld2VzdFBhZ2VzU2VlbiA9IG1fcHJvY2Vzc2VzW2ldLT5wYWdl cygpLnNpemUoKTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gcmVzdWx0OworfQorCiBQ YXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gV2ViQ29udGV4dDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xp ZW50KiBwYWdlQ2xpZW50LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCwgV2ViUGFnZVByb3h5KiBy ZWxhdGVkUGFnZSkKIHsKICAgICBSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiBwcm9jZXNzOwpAQCAt NjI2LDEwICs2NTQsOCBAQCBQYXNzUmVmUHRyPFdlYlBhZ2VQcm94eT4gV2ViQ29udGV4dDo6Y3Jl CiAgICAgICAgIH0gZWxzZSBpZiAocmVsYXRlZFBhZ2UpIHsKICAgICAgICAgICAgIC8vIFNoYXJp bmcgcHJvY2Vzc2VzLCBlLmcuIHdoZW4gY3JlYXRpbmcgdGhlIHBhZ2UgdmlhIHdpbmRvdy5vcGVu KCkuCiAgICAgICAgICAgICBwcm9jZXNzID0gcmVsYXRlZFBhZ2UtPnByb2Nlc3MoKTsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogPHJk YXI6Ly9wcm9ibGVtLzEyMjM5NjYxPiBDb25zaWRlciBsaW1pdGluZyB0aGUgbnVtYmVyIG9mIHdl YiBwcm9jZXNzZXMgaW4gcGVyLXRhYiBwcm9jZXNzIG1vZGVsLgotICAgICAgICAgICAgcHJvY2Vz cyA9IGNyZWF0ZU5ld1dlYlByb2Nlc3MoKTsKLSAgICAgICAgfQorICAgICAgICB9IGVsc2UKKyAg ICAgICAgICAgIHByb2Nlc3MgPSBjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3ND b3VudExpbWl0KCk7CiAgICAgfQogCiAgICAgaWYgKCFwYWdlR3JvdXApCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHJldmlzaW9uIDEzNjk5NykKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTIxOSw3ICsy MTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDb29raWVTdG9yYWdlRGlyZWN0b3J5KGNvbnN0 IFN0cmluZyYgZGlyKSB7IG1fb3ZlcnJpZGVDb29raWVTdG9yYWdlRGlyZWN0b3J5ID0gZGlyOyB9 CiAKICAgICBXZWJQcm9jZXNzUHJveHkqIGVuc3VyZVNoYXJlZFdlYlByb2Nlc3MoKTsKLSAgICBQ YXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gY3JlYXRlTmV3V2ViUHJvY2VzcygpOworICAgIFdl YlByb2Nlc3NQcm94eSogY3JlYXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRM aW1pdCgpOyAvLyBXaWxsIHJldHVybiBhbiBleGlzdGluZyBvbmUgaWYgbGltaXQgaXMgbWV0Lgog ICAgIHZvaWQgd2FybUluaXRpYWxQcm9jZXNzKCk7CiAKICAgICBib29sIHNob3VsZFRlcm1pbmF0 ZShXZWJQcm9jZXNzUHJveHkqKTsKQEAgLTI1NSwxMiArMjU1LDE1IEBAIHB1YmxpYzoKIAogcHJp dmF0ZToKICAgICBXZWJDb250ZXh0KFByb2Nlc3NNb2RlbCwgY29uc3QgU3RyaW5nJiBpbmplY3Rl ZEJ1bmRsZVBhdGgpOworICAgIHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplKCk7CiAKICAgICB2aXJ0 dWFsIFR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIEFQSVR5cGU7IH0KIAogICAgIHZvaWQgcGxh dGZvcm1Jbml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJik7 CiAgICAgdm9pZCBwbGF0Zm9ybUludmFsaWRhdGVDb250ZXh0KCk7CiAKKyAgICBXZWJQcm9jZXNz UHJveHkqIGNyZWF0ZU5ld1dlYlByb2Nlc3MoKTsKKwogI2lmIFBMQVRGT1JNKE1BQykKICAgICB2 b2lkIGdldFBhc3RlYm9hcmRUeXBlcyhjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lLCBWZWN0 b3I8U3RyaW5nPiYgcGFzdGVib2FyZFR5cGVzKTsKICAgICB2b2lkIGdldFBhc3RlYm9hcmRQYXRo bmFtZXNGb3JUeXBlKGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZE5hbWUsIGNvbnN0IFN0cmluZyYg cGFzdGVib2FyZFR5cGUsIFZlY3RvcjxTdHJpbmc+JiBwYXRobmFtZXMpOwpAQCAtMzE1LDYgKzMx OCw3IEBAIHByaXZhdGU6CiAjZW5kaWYKIAogICAgIFByb2Nlc3NNb2RlbCBtX3Byb2Nlc3NNb2Rl bDsKKyAgICB1bnNpZ25lZCBtX3dlYlByb2Nlc3NDb3VudExpbWl0OyAvLyBUaGUgbGltaXQgaGFz IG5vIGVmZmVjdCB3aGVuIHByb2Nlc3MgbW9kZWwgaXMgUHJvY2Vzc01vZGVsU2hhcmVkU2Vjb25k YXJ5UHJvY2Vzcy4KICAgICAKICAgICBWZWN0b3I8UmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gPiBt X3Byb2Nlc3NlczsKICAgICBib29sIG1faGF2ZUluaXRpYWxFbXB0eVByb2Nlc3M7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTM2OTk3 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTM4NSw3ICszODUsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dl YlByb2Nlc3MoCiAgICAgaWYgKG1fcHJvY2Vzcy0+Y29udGV4dCgpLT5wcm9jZXNzTW9kZWwoKSA9 PSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQcm9jZXNzKQogICAgICAgICBtX3Byb2Nlc3Mg PSBtX3Byb2Nlc3MtPmNvbnRleHQoKS0+ZW5zdXJlU2hhcmVkV2ViUHJvY2VzcygpOwogICAgIGVs c2UKLSAgICAgICAgbV9wcm9jZXNzID0gbV9wcm9jZXNzLT5jb250ZXh0KCktPmNyZWF0ZU5ld1dl YlByb2Nlc3MoKTsKKyAgICAgICAgbV9wcm9jZXNzID0gbV9wcm9jZXNzLT5jb250ZXh0KCktPmNy ZWF0ZU5ld1dlYlByb2Nlc3NSZXNwZWN0aW5nUHJvY2Vzc0NvdW50TGltaXQoKTsKICAgICBtX3By b2Nlc3MtPmFkZEV4aXN0aW5nV2ViUGFnZSh0aGlzLCBtX3BhZ2VJRCk7CiAKICAgICBpbml0aWFs aXplV2ViUGFnZSgpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250 ZXh0TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2Vi Q29udGV4dE1hYy5tbQkocmV2aXNpb24gMTM2OTk3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw3IEBA IE5TU3RyaW5nICpXZWJEYXRhYmFzZURpcmVjdG9yeURlZmF1bHRzS2UKIE5TU3RyaW5nICpXZWJL aXRMb2NhbENhY2hlRGVmYXVsdHNLZXkgPSBAIldlYktpdExvY2FsQ2FjaGUiOwogTlNTdHJpbmcg KldlYlN0b3JhZ2VEaXJlY3RvcnlEZWZhdWx0c0tleSA9IEAiV2ViS2l0TG9jYWxTdG9yYWdlRGF0 YWJhc2VQYXRoUHJlZmVyZW5jZUtleSI7CiBOU1N0cmluZyAqV2ViS2l0S2VybmluZ0FuZExpZ2F0 dXJlc0VuYWJsZWRCeURlZmF1bHREZWZhdWx0c0tleSA9IEAiV2ViS2l0S2VybmluZ0FuZExpZ2F0 dXJlc0VuYWJsZWRCeURlZmF1bHQiOworTlNTdHJpbmcgKldlYktpdFdlYlByb2Nlc3NDb3VudExp bWl0RGVmYXVsdHNLZXkgPSBAIldlYktpdFdlYlByb2Nlc3NDb3VudExpbWl0IjsKIAogc3RhdGlj IE5TU3RyaW5nICpXZWJLaXRBcHBsaWNhdGlvbkRpZENoYW5nZUFjY2Vzc2liaWxpdHlFbmhhbmNl ZFVzZXJJbnRlcmZhY2VOb3RpZmljYXRpb24gPSBAIk5TQXBwbGljYXRpb25EaWRDaGFuZ2VBY2Nl c3NpYmlsaXR5RW5oYW5jZWRVc2VySW50ZXJmYWNlTm90aWZpY2F0aW9uIjsKIApAQCAtNjAsNiAr NjEsMzIgQEAgTlNTdHJpbmcgKlNjaGVtZUZvckN1c3RvbVByb3RvY29sVW5yZWdpcwogCiBib29s IFdlYkNvbnRleHQ6OnNfYXBwbGljYXRpb25Jc09jY2x1ZGVkID0gZmFsc2U7CiAKK3N0YXRpYyB2 b2lkIHJlZ2lzdGVyVXNlckRlZmF1bHRzSWZOZWVkZWQoKQoreworICAgIHN0YXRpYyBib29sIGRp ZFJlZ2lzdGVyOworICAgIGlmIChkaWRSZWdpc3RlcikKKyAgICAgICAgcmV0dXJuOworCisgICAg ZGlkUmVnaXN0ZXIgPSB0cnVlOworICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKnJlZ2lzdHJhdGlv bkRpY3Rpb25hcnkgPSBbTlNNdXRhYmxlRGljdGlvbmFyeSBkaWN0aW9uYXJ5XTsKKyAgICAKKyAg ICBbcmVnaXN0cmF0aW9uRGljdGlvbmFyeSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhJ bnRlZ2VyOklOVF9NQVhdIGZvcktleTpXZWJLaXRXZWJQcm9jZXNzQ291bnRMaW1pdERlZmF1bHRz S2V5XTsKKyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKKyAgICBb cmVnaXN0cmF0aW9uRGljdGlvbmFyeSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhCb29s OllFU10gZm9yS2V5OldlYktpdEtlcm5pbmdBbmRMaWdhdHVyZXNFbmFibGVkQnlEZWZhdWx0RGVm YXVsdHNLZXldOworI2VuZGlmCisKKyAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRl ZmF1bHRzXSByZWdpc3RlckRlZmF1bHRzOnJlZ2lzdHJhdGlvbkRpY3Rpb25hcnldOworfQorCit2 b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZSgpCit7CisgICAgcmVnaXN0ZXJVc2Vy RGVmYXVsdHNJZk5lZWRlZCgpOworCisgICAgbV93ZWJQcm9jZXNzQ291bnRMaW1pdCA9IFtbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGludGVnZXJGb3JLZXk6V2ViS2l0V2Vi UHJvY2Vzc0NvdW50TGltaXREZWZhdWx0c0tleV07CisgICAgaWYgKG1fd2ViUHJvY2Vzc0NvdW50 TGltaXQgPD0gMCkKKyAgICAgICAgbV93ZWJQcm9jZXNzQ291bnRMaW1pdCA9IDE7Cit9CisKIFN0 cmluZyBXZWJDb250ZXh0OjphcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkKIHsKICAgICBOU1N0 cmluZyAqYXBwTmFtZSA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmllcl07 CkBAIC04MiwxOCArMTA5LDYgQEAgU3RyaW5nIFdlYkNvbnRleHQ6OmFwcGxpY2F0aW9uQ2FjaGVE aXJlYwogICAgIHJldHVybiBbY2FjaGVEaXIgc3RyaW5nQnlBcHBlbmRpbmdQYXRoQ29tcG9uZW50 OmFwcE5hbWVdOwogfQogCi1zdGF0aWMgdm9pZCByZWdpc3RlclVzZXJEZWZhdWx0c0lmTmVlZGVk KCkKLXsKLSAgICBzdGF0aWMgYm9vbCBkaWRSZWdpc3RlcjsKLSAgICBpZiAoZGlkUmVnaXN0ZXIp Ci0gICAgICAgIHJldHVybjsKLQotICAgIGRpZFJlZ2lzdGVyID0gdHJ1ZTsKLSNpZiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKLSAgICBbW05TVXNlckRlZmF1bHRzIHN0 YW5kYXJkVXNlckRlZmF1bHRzXSByZWdpc3RlckRlZmF1bHRzOltOU0RpY3Rpb25hcnkgZGljdGlv bmFyeVdpdGhPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10gZm9yS2V5OldlYktp dEtlcm5pbmdBbmRMaWdhdHVyZXNFbmFibGVkQnlEZWZhdWx0RGVmYXVsdHNLZXldXTsKLSNlbmRp ZgotfQotCiB2b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MoV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKIHsKICAgICBwYXJhbWV0ZXJz LnByZXNlbnRlckFwcGxpY2F0aW9uUGlkID0gZ2V0cGlkKCk7CkBAIC0xMDIsNyArMTE3LDYgQEAg dm9pZCBXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcgogICAgIHBhcmFtZXRlcnMu bnNVUkxDYWNoZU1lbW9yeUNhcGFjaXR5ID0gW3VybENhY2hlIG1lbW9yeUNhcGFjaXR5XTsKICAg ICBwYXJhbWV0ZXJzLm5zVVJMQ2FjaGVEaXNrQ2FwYWNpdHkgPSBbdXJsQ2FjaGUgZGlza0NhcGFj aXR5XTsKIAotICAgIHJlZ2lzdGVyVXNlckRlZmF1bHRzSWZOZWVkZWQoKTsKICNpZiBfX01BQ19P U19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwOTAKICAgICBwYXJhbWV0ZXJzLnNob3VsZEZv cmNlU2NyZWVuRm9udFN1YnN0aXR1dGlvbiA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2Vy RGVmYXVsdHNdIGJvb2xGb3JLZXk6QCJOU0ZvbnREZWZhdWx0U2NyZWVuRm9udFN1YnN0aXR1dGlv bkVuYWJsZWQiXTsKICNlbmRpZgpAQCAtMTIzLDcgKzEzNyw5IEBAIHZvaWQgV2ViQ29udGV4dDo6 cGxhdGZvcm1Jbml0aWFsaXplV2ViUHIKICAgICBOU0FycmF5ICpzY2hlbWVzID0gW1tXS0Jyb3dz aW5nQ29udGV4dENvbnRyb2xsZXIgY3VzdG9tU2NoZW1lc10gYWxsT2JqZWN0c107CiAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBbc2NoZW1lcyBjb3VudF07ICsraSkKICAgICAgICAgcGFyYW1l dGVycy51cmxTY2hlbWVzUmVnaXN0ZXJlZEZvckN1c3RvbVByb3RvY29scy5hcHBlbmQoW3NjaGVt ZXMgb2JqZWN0QXRJbmRleDppXSk7Ci0gICAgCisKKyAgICAvLyBGSVhNRShNdWx0aS1XZWJQcm9j ZXNzKTogV2UgcmVnaXN0ZXIgb2JzZXJ2ZXJzIGZvciBldmVyeSBwcm9jZXNzIHRoYXQgaXMgY3Jl YXRlZCwgd2hpY2ggbWFrZXMgbm8gc2Vuc2UuCisKICAgICBtX2N1c3RvbVNjaGVtZVJlZ2lzdGVy ZWRPYnNlcnZlciA9IFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2Jz ZXJ2ZXJGb3JOYW1lOldlYktpdDo6U2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2xSZWdpc3RlcmVkTm90 aWZpY2F0aW9uTmFtZSBvYmplY3Q6bmlsIHF1ZXVlOltOU09wZXJhdGlvblF1ZXVlIGN1cnJlbnRR dWV1ZV0gdXNpbmdCbG9jazpeKE5TTm90aWZpY2F0aW9uICpub3RpZmljYXRpb24pIHsKICAgICAg ICAgTlNTdHJpbmcgKnNjaGVtZSA9IFtub3RpZmljYXRpb24gb2JqZWN0XTsKICAgICAgICAgQVNT RVJUKFtzY2hlbWUgaXNLaW5kT2ZDbGFzczpbTlNTdHJpbmcgY2xhc3NdXSk7Cg==