172677 2017-05-26 21:24:05 -0700 Simply some NSNumber usage 2017-05-30 20:20:04 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue joepeck sam webkit-bug-importer oldest_to_newest 1313357 0 joepeck 2017-05-26 21:24:05 -0700 Convert a bunch of simple cases: [NSNumber numberWithBool:YES] => @YES [NSNumber numberWithBool:NO] => @NO I think this improves readability. 1313358 1 311406 joepeck 2017-05-26 21:25:05 -0700 Created attachment 311406 [PATCH] Proposed Fix 1313370 2 311406 commit-queue 2017-05-26 22:25:10 -0700 Comment on attachment 311406 [PATCH] Proposed Fix Clearing flags on attachment: 311406 Committed r217520: <http://trac.webkit.org/changeset/217520> 1313371 3 commit-queue 2017-05-26 22:25:11 -0700 All reviewed patches have been landed. Closing bug. 1314003 4 webkit-bug-importer 2017-05-30 20:20:04 -0700 <rdar://problem/32479664> 311406 2017-05-26 21:25:05 -0700 2017-05-26 22:25:10 -0700 [PATCH] Proposed Fix simplify-2.patch text/plain 15110 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlODVhYzAyY2U4ZS4uMjUxZDcyZTVmMjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNSBAQAorMjAxNy0wNS0yNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFNpbXBseSBzb21lIE5TTnVtYmVyIHVzYWdlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzI2NzcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaW9zL1dl YkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVySU9TLm1tOgorICAgICAgICAoLVtXZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlciBfYWRkQWNjZXNzaWJpbGl0eU9iamVjdDp0b1RleHRNYXJrZXJB cnJheTpdKToKKyAgICAgICAgKEFYQXR0cmlidXRlU3RyaW5nU2V0Rm9udCk6CisgICAgICAgIChB WEF0dHJpYnV0ZVN0cmluZ1NldFN0eWxlKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9B WE9iamVjdENhY2hlTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cG9z dFRleHRTdGF0ZUNoYW5nZVBsYXRmb3JtTm90aWZpY2F0aW9uKToKKyAgICAgICAgKiBhY2Nlc3Np YmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAg KEFYQXR0cmlidXRlU3RyaW5nU2V0U3R5bGUpOgorICAgICAgICAoQVhBdHRyaWJ1dGVTdHJpbmdT ZXRTcGVsbGluZyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZUFWQXNzZXRGb3JV UkwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FGaWx0 ZXJzQ29jb2EubW06CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OmxldmVsSW5kaWNhdG9yRm9yKToKKwogMjAx Ny0wNS0xMiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAg IFtSZXNvdXJjZSBUaW1pbmddIE1pZ2h0IG1pc3Mgc29tZSBjYWNoZSBoaXRzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0 V3JhcHBlcklPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaW9zL1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVySU9TLm1tCmluZGV4IDMwYzJlMjk2ZGE1Li4zYzYxMjMwZjIw ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pb3MvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJJT1MubW0KQEAgLTIwMjcsNyAr MjAyNyw3IEBAIC0gKEJPT0wpX2FkZEFjY2Vzc2liaWxpdHlPYmplY3Q6KEFjY2Vzc2liaWxpdHlP YmplY3QqKWF4T2JqZWN0IHRvVGV4dE1hcmtlckFycmF5CiAgICAgICAgIHJldHVybiBZRVM7CiAg ICAgCiAgICAgLy8gRXhwbGljaXR5IHNldCB0aGF0IHRoaXMgaXMgbm93IGFuIGVsZW1lbnQgKGlu IGNhc2Ugb3RoZXIgbG9naWMgdHJpZXMgdG8gb3ZlcnJpZGUpLgotICAgIFt3cmFwcGVyIHNldFZh bHVlOltOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdIGZvcktleTpAImlzQWNjZXNzaWJpbGl0 eUVsZW1lbnQiXTsgICAgCisgICAgW3dyYXBwZXIgc2V0VmFsdWU6QFlFUyBmb3JLZXk6QCJpc0Fj Y2Vzc2liaWxpdHlFbGVtZW50Il07ICAgIAogICAgIFthcnJheSBhZGRPYmplY3Q6d3JhcHBlcl07 CiAgICAgcmV0dXJuIFlFUzsKIH0KQEAgLTIxMjAsOSArMjEyMCw5IEBAIHN0YXRpYyB2b2lkIEFY QXR0cmlidXRlU3RyaW5nU2V0Rm9udChOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nKiBhdHRyU3Ry aW5nLCBDVEZvCiAgICAgaWYgKFtzaXplIGJvb2xWYWx1ZV0pCiAgICAgICAgIFthdHRyU3RyaW5n IGFkZEF0dHJpYnV0ZTpVSUFjY2Vzc2liaWxpdHlUb2tlbkZvbnRTaXplIHZhbHVlOnNpemUgcmFu Z2U6cmFuZ2VdOwogICAgIGlmIChbYm9sZCBib29sVmFsdWVdIHx8ICh0cmFpdHMgJiBrQ1RGb250 VHJhaXRCb2xkKSkKLSAgICAgICAgW2F0dHJTdHJpbmcgYWRkQXR0cmlidXRlOlVJQWNjZXNzaWJp bGl0eVRva2VuQm9sZCB2YWx1ZTpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSByYW5nZTpy YW5nZV07CisgICAgICAgIFthdHRyU3RyaW5nIGFkZEF0dHJpYnV0ZTpVSUFjY2Vzc2liaWxpdHlU b2tlbkJvbGQgdmFsdWU6QFlFUyByYW5nZTpyYW5nZV07CiAgICAgaWYgKHRyYWl0cyAmIGtDVEZv bnRUcmFpdEl0YWxpYykKLSAgICAgICAgW2F0dHJTdHJpbmcgYWRkQXR0cmlidXRlOlVJQWNjZXNz aWJpbGl0eVRva2VuSXRhbGljIHZhbHVlOltOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdIHJh bmdlOnJhbmdlXTsKKyAgICAgICAgW2F0dHJTdHJpbmcgYWRkQXR0cmlidXRlOlVJQWNjZXNzaWJp bGl0eVRva2VuSXRhbGljIHZhbHVlOkBZRVMgcmFuZ2U6cmFuZ2VdOwogCiB9CiAKQEAgLTIxNDMs NyArMjE0Myw3IEBAIHN0YXRpYyB2b2lkIEFYQXR0cmlidXRlU3RyaW5nU2V0U3R5bGUoTlNNdXRh YmxlQXR0cmlidXRlZFN0cmluZyogYXR0clN0cmluZywgUmVuCiAgICAgICAgICAgICAgICAgCiAg ICAgaW50IGRlY29yID0gc3R5bGUudGV4dERlY29yYXRpb25zSW5FZmZlY3QoKTsKICAgICBpZiAo ZGVjb3IgJiBUZXh0RGVjb3JhdGlvblVuZGVybGluZSkKLSAgICAgICAgQVhBdHRyaWJ1dGVTdHJp bmdTZXROdW1iZXIoYXR0clN0cmluZywgVUlBY2Nlc3NpYmlsaXR5VG9rZW5VbmRlcmxpbmUsIFtO U051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCByYW5nZSk7CisgICAgICAgIEFYQXR0cmlidXRl U3RyaW5nU2V0TnVtYmVyKGF0dHJTdHJpbmcsIFVJQWNjZXNzaWJpbGl0eVRva2VuVW5kZXJsaW5l LCBAWUVTLCByYW5nZSk7CiB9CiAKIHN0YXRpYyB2b2lkIEFYQXR0cmlidXRlZFN0cmluZ0FwcGVu ZFRleHQoTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyogYXR0clN0cmluZywgTm9kZSogbm9kZSwg TlNTdHJpbmcgKnRleHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9BWE9iamVjdENhY2hlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9t YWMvQVhPYmplY3RDYWNoZU1hYy5tbQppbmRleCBjYmFmYjgwYTAxMy4uN2EyZTQwMTVmNjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVN YWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNo ZU1hYy5tbQpAQCAtMzY0LDcgKzM2NCw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdFRleHRT dGF0ZUNoYW5nZVBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3QqCiAKICAg ICBOU011dGFibGVEaWN0aW9uYXJ5ICp1c2VySW5mbyA9IFtbTlNNdXRhYmxlRGljdGlvbmFyeSBh bGxvY10gaW5pdFdpdGhDYXBhY2l0eTo1XTsKICAgICBpZiAobV9pc1N5bmNocm9uaXppbmdTZWxl Y3Rpb24pCi0gICAgICAgIFt1c2VySW5mbyBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJlcldpdGhC b29sOllFU10gZm9yS2V5Ok5TQWNjZXNzaWJpbGl0eVRleHRTdGF0ZVN5bmNLZXldOworICAgICAg ICBbdXNlckluZm8gc2V0T2JqZWN0OkBZRVMgZm9yS2V5Ok5TQWNjZXNzaWJpbGl0eVRleHRTdGF0 ZVN5bmNLZXldOwogICAgIGlmIChpbnRlbnQudHlwZSAhPSBBWFRleHRTdGF0ZUNoYW5nZVR5cGVV bmtub3duKSB7CiAgICAgICAgIFt1c2VySW5mbyBzZXRPYmplY3Q6QChwbGF0Zm9ybUNoYW5nZVR5 cGVGb3JXZWJDb3JlQ2hhbmdlVHlwZShpbnRlbnQudHlwZSkpIGZvcktleTpOU0FjY2Vzc2liaWxp dHlUZXh0U3RhdGVDaGFuZ2VUeXBlS2V5XTsKICAgICAgICAgc3dpdGNoIChpbnRlbnQudHlwZSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCA0MTYxZTMxYTVj NS4uYWRiODBkZjMzNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1t CkBAIC04MjQsNyArODI0LDcgQEAgc3RhdGljIHZvaWQgQVhBdHRyaWJ1dGVTdHJpbmdTZXRTdHls ZShOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nKiBhdHRyU3RyaW5nLCBSZW4KICAgICAKICAgICAv LyBzZXQgc2hhZG93CiAgICAgaWYgKHN0eWxlLnRleHRTaGFkb3coKSkKLSAgICAgICAgQVhBdHRy aWJ1dGVTdHJpbmdTZXROdW1iZXIoYXR0clN0cmluZywgTlNBY2Nlc3NpYmlsaXR5U2hhZG93VGV4 dEF0dHJpYnV0ZSwgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sIHJhbmdlKTsKKyAgICAg ICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXROdW1iZXIoYXR0clN0cmluZywgTlNBY2Nlc3NpYmlsaXR5 U2hhZG93VGV4dEF0dHJpYnV0ZSwgQFlFUywgcmFuZ2UpOwogICAgIGVsc2UKICAgICAgICAgW2F0 dHJTdHJpbmcgcmVtb3ZlQXR0cmlidXRlOk5TQWNjZXNzaWJpbGl0eVNoYWRvd1RleHRBdHRyaWJ1 dGUgcmFuZ2U6cmFuZ2VdOwogICAgIApAQCAtODQ1LDEyICs4NDUsMTIgQEAgc3RhdGljIHZvaWQg QVhBdHRyaWJ1dGVTdHJpbmdTZXRTdHlsZShOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nKiBhdHRy U3RyaW5nLCBSZW4KICAgICAgICAgYXV0byBkZWNvcmF0aW9uU3R5bGVzID0gVGV4dERlY29yYXRp b25QYWludGVyOjpzdHlsZXNGb3JSZW5kZXJlcigqcmVuZGVyZXIsIGRlY29yKTsKIAogICAgICAg ICBpZiAoKGRlY29yICYgVGV4dERlY29yYXRpb25VbmRlcmxpbmUpICE9IDApIHsKLSAgICAgICAg ICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0TnVtYmVyKGF0dHJTdHJpbmcsIE5TQWNjZXNzaWJpbGl0 eVVuZGVybGluZVRleHRBdHRyaWJ1dGUsIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCBy YW5nZSk7CisgICAgICAgICAgICBBWEF0dHJpYnV0ZVN0cmluZ1NldE51bWJlcihhdHRyU3RyaW5n LCBOU0FjY2Vzc2liaWxpdHlVbmRlcmxpbmVUZXh0QXR0cmlidXRlLCBAWUVTLCByYW5nZSk7CiAg ICAgICAgICAgICBBWEF0dHJpYnV0ZVN0cmluZ1NldENvbG9yKGF0dHJTdHJpbmcsIE5TQWNjZXNz aWJpbGl0eVVuZGVybGluZUNvbG9yVGV4dEF0dHJpYnV0ZSwgbnNDb2xvcihkZWNvcmF0aW9uU3R5 bGVzLnVuZGVybGluZUNvbG9yKSwgcmFuZ2UpOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAg ICBpZiAoKGRlY29yICYgVGV4dERlY29yYXRpb25MaW5lVGhyb3VnaCkgIT0gMCkgewotICAgICAg ICAgICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXROdW1iZXIoYXR0clN0cmluZywgTlNBY2Nlc3NpYmls aXR5U3RyaWtldGhyb3VnaFRleHRBdHRyaWJ1dGUsIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZ RVNdLCByYW5nZSk7CisgICAgICAgICAgICBBWEF0dHJpYnV0ZVN0cmluZ1NldE51bWJlcihhdHRy U3RyaW5nLCBOU0FjY2Vzc2liaWxpdHlTdHJpa2V0aHJvdWdoVGV4dEF0dHJpYnV0ZSwgQFlFUywg cmFuZ2UpOwogICAgICAgICAgICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXRDb2xvcihhdHRyU3RyaW5n LCBOU0FjY2Vzc2liaWxpdHlTdHJpa2V0aHJvdWdoQ29sb3JUZXh0QXR0cmlidXRlLCBuc0NvbG9y KGRlY29yYXRpb25TdHlsZXMubGluZXRocm91Z2hDb2xvciksIHJhbmdlKTsKICAgICAgICAgfQog ICAgIH0KQEAgLTg1OCw3ICs4NTgsNyBAQCBzdGF0aWMgdm9pZCBBWEF0dHJpYnV0ZVN0cmluZ1Nl dFN0eWxlKE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcqIGF0dHJTdHJpbmcsIFJlbgogICAgIC8v IEluZGljYXRlIGJhY2tncm91bmQgaGlnaGxpZ2h0aW5nLgogICAgIGZvciAoTm9kZSogbm9kZSA9 IHJlbmRlcmVyLT5ub2RlKCk7IG5vZGU7IG5vZGUgPSBub2RlLT5wYXJlbnROb2RlKCkpIHsKICAg ICAgICAgaWYgKG5vZGUtPmhhc1RhZ05hbWUobWFya1RhZykpCi0gICAgICAgICAgICBBWEF0dHJp YnV0ZVN0cmluZ1NldE51bWJlcihhdHRyU3RyaW5nLCBAIkFYSGlnaGxpZ2h0IiwgW05TTnVtYmVy IG51bWJlcldpdGhCb29sOllFU10sIHJhbmdlKTsKKyAgICAgICAgICAgIEFYQXR0cmlidXRlU3Ry aW5nU2V0TnVtYmVyKGF0dHJTdHJpbmcsIEAiQVhIaWdobGlnaHQiLCBAWUVTLCByYW5nZSk7CiAg ICAgfQogfQogCkBAIC04ODcsMTIgKzg4NywxMSBAQCBzdGF0aWMgdm9pZCBBWEF0dHJpYnV0ZVN0 cmluZ1NldFNwZWxsaW5nKE5TTXV0YWJsZUF0dHJpYnV0ZWRTdHJpbmcqIGF0dHJTdHJpbmcsCiAg ICAgICAgIGNoZWNrVGV4dE9mUGFyYWdyYXBoKCpjaGVja2VyLCB0ZXh0LCBUZXh0Q2hlY2tpbmdU eXBlU3BlbGxpbmcsIHJlc3VsdHMsIG5vZGUtPmRvY3VtZW50KCkuZnJhbWUoKS0+c2VsZWN0aW9u KCkuc2VsZWN0aW9uKCkpOwogICAgICAgICAKICAgICAgICAgc2l6ZV90IHNpemUgPSByZXN1bHRz LnNpemUoKTsKLSAgICAgICAgTlNOdW1iZXIqIHRydWVWYWx1ZSA9IFtOU051bWJlciBudW1iZXJX aXRoQm9vbDpZRVNdOwogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6ZTsgaSsr KSB7CiAgICAgICAgICAgICBjb25zdCBUZXh0Q2hlY2tpbmdSZXN1bHQmIHJlc3VsdCA9IHJlc3Vs dHNbaV07Ci0gICAgICAgICAgICBBWEF0dHJpYnV0ZVN0cmluZ1NldE51bWJlcihhdHRyU3RyaW5n LCBOU0FjY2Vzc2liaWxpdHlNaXNzcGVsbGVkVGV4dEF0dHJpYnV0ZSwgdHJ1ZVZhbHVlLCBOU01h a2VSYW5nZShyZXN1bHQubG9jYXRpb24gKyByYW5nZS5sb2NhdGlvbiwgcmVzdWx0Lmxlbmd0aCkp OworICAgICAgICAgICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXROdW1iZXIoYXR0clN0cmluZywgTlNB Y2Nlc3NpYmlsaXR5TWlzc3BlbGxlZFRleHRBdHRyaWJ1dGUsIEBZRVMsIE5TTWFrZVJhbmdlKHJl c3VsdC5sb2NhdGlvbiArIHJhbmdlLmxvY2F0aW9uLCByZXN1bHQubGVuZ3RoKSk7CiAjaWYgUExB VEZPUk0oTUFDKQotICAgICAgICAgICAgQVhBdHRyaWJ1dGVTdHJpbmdTZXROdW1iZXIoYXR0clN0 cmluZywgTlNBY2Nlc3NpYmlsaXR5TWFya2VkTWlzc3BlbGxlZFRleHRBdHRyaWJ1dGUsIHRydWVW YWx1ZSwgTlNNYWtlUmFuZ2UocmVzdWx0LmxvY2F0aW9uICsgcmFuZ2UubG9jYXRpb24sIHJlc3Vs dC5sZW5ndGgpKTsKKyAgICAgICAgICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0TnVtYmVyKGF0dHJT dHJpbmcsIE5TQWNjZXNzaWJpbGl0eU1hcmtlZE1pc3NwZWxsZWRUZXh0QXR0cmlidXRlLCBAWUVT LCBOU01ha2VSYW5nZShyZXN1bHQubG9jYXRpb24gKyByYW5nZS5sb2NhdGlvbiwgcmVzdWx0Lmxl bmd0aCkpOwogI2VuZGlmCiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwpAQCAtOTA2LDkgKzkw NSw5IEBAIHN0YXRpYyB2b2lkIEFYQXR0cmlidXRlU3RyaW5nU2V0U3BlbGxpbmcoTlNNdXRhYmxl QXR0cmlidXRlZFN0cmluZyogYXR0clN0cmluZywKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAKICAgICAgICAgTlNSYW5nZSBzcGVsbFJhbmdlID0gTlNNYWtlUmFuZ2UocmFuZ2UubG9jYXRp b24gKyBjdXJyZW50UG9zaXRpb24gKyBtaXNzcGVsbGluZ0xvY2F0aW9uLCBtaXNzcGVsbGluZ0xl bmd0aCk7Ci0gICAgICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0TnVtYmVyKGF0dHJTdHJpbmcsIE5T QWNjZXNzaWJpbGl0eU1pc3NwZWxsZWRUZXh0QXR0cmlidXRlLCBbTlNOdW1iZXIgbnVtYmVyV2l0 aEJvb2w6WUVTXSwgc3BlbGxSYW5nZSk7CisgICAgICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0TnVt YmVyKGF0dHJTdHJpbmcsIE5TQWNjZXNzaWJpbGl0eU1pc3NwZWxsZWRUZXh0QXR0cmlidXRlLCBA WUVTLCBzcGVsbFJhbmdlKTsKICNpZiBQTEFURk9STShNQUMpCi0gICAgICAgIEFYQXR0cmlidXRl U3RyaW5nU2V0TnVtYmVyKGF0dHJTdHJpbmcsIE5TQWNjZXNzaWJpbGl0eU1hcmtlZE1pc3NwZWxs ZWRUZXh0QXR0cmlidXRlLCBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgc3BlbGxSYW5n ZSk7CisgICAgICAgIEFYQXR0cmlidXRlU3RyaW5nU2V0TnVtYmVyKGF0dHJTdHJpbmcsIE5TQWNj ZXNzaWJpbGl0eU1hcmtlZE1pc3NwZWxsZWRUZXh0QXR0cmlidXRlLCBAWUVTLCBzcGVsbFJhbmdl KTsKICNlbmRpZgogCiAgICAgICAgIGN1cnJlbnRQb3NpdGlvbiArPSBtaXNzcGVsbGluZ0xvY2F0 aW9uICsgbWlzc3BlbGxpbmdMZW5ndGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb25PYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCAzMjRi NjUwMDEyYi4uYjM1MzVmZDM4NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQpAQCAtOTMyLDcg KzkzMiw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRl QVZBc3NldEZvclVSTChjb25zdCBTdHJpbmcmIHVybCkKICAgICAgICAgW29wdGlvbnMuZ2V0KCkg c2V0T2JqZWN0OmhlYWRlckZpZWxkcy5nZXQoKSBmb3JLZXk6QCJBVlVSTEFzc2V0SFRUUEhlYWRl ckZpZWxkc0tleSJdOwogCiAgICAgaWYgKHBsYXllcigpLT5kb2VzSGF2ZUF0dHJpYnV0ZSgieC1p dHVuZXMtaW5oZXJpdC11cmktcXVlcnktY29tcG9uZW50IikpCi0gICAgICAgIFtvcHRpb25zLmdl dCgpIHNldE9iamVjdDogW05TTnVtYmVyIG51bWJlcldpdGhCb29sOiBUUlVFXSBmb3JLZXk6IEFW VVJMQXNzZXRJbmhlcml0VVJJUXVlcnlDb21wb25lbnRGcm9tUmVmZXJlbmNpbmdVUklLZXldOwor ICAgICAgICBbb3B0aW9ucy5nZXQoKSBzZXRPYmplY3Q6QFlFUyBmb3JLZXk6IEFWVVJMQXNzZXRJ bmhlcml0VVJJUXVlcnlDb21wb25lbnRGcm9tUmVmZXJlbmNpbmdVUklLZXldOwogCiAjaWYgUExB VEZPUk0oSU9TKQogICAgIC8vIEZJWE1FOiByZGFyOi8vcHJvYmxlbS8yMDM1NDY4OApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1D QUZpbHRlcnNDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL2Nv Y29hL1BsYXRmb3JtQ0FGaWx0ZXJzQ29jb2EubW0KaW5kZXggMDE2NWZkOTc3N2QuLjYwNTY3N2Rl YzEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2Nv YS9QbGF0Zm9ybUNBRmlsdGVyc0NvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FGaWx0ZXJzQ29jb2EubW0KQEAgLTE1OCw3ICsx NTgsNyBAQCB2b2lkIFBsYXRmb3JtQ0FGaWx0ZXJzOjpzZXRGaWx0ZXJzT25MYXllcihQbGF0Zm9y bUxheWVyKiBsYXllciwgY29uc3QgRmlsdGVyT3BlcgogICAgICAgICAgICAgW2ZpbHRlciBzZXRW YWx1ZTpbTlNOdW1iZXIgbnVtYmVyV2l0aEZsb2F0OmZsb2F0VmFsdWVGb3JMZW5ndGgoYmx1ck9w ZXJhdGlvbi5zdGREZXZpYXRpb24oKSwgMCldIGZvcktleTpAImlucHV0UmFkaXVzIl07CiAjaWYg RU5BQkxFKEZJTFRFUlNfTEVWRUxfMikKICAgICAgICAgICAgIGlmIChbbGF5ZXIgaXNLaW5kT2ZD bGFzczpbQ0FCYWNrZHJvcExheWVyIGNsYXNzXV0pCi0gICAgICAgICAgICAgICAgW2ZpbHRlciBz ZXRWYWx1ZTpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSBmb3JLZXk6QCJpbnB1dE5vcm1h bGl6ZUVkZ2VzIl07CisgICAgICAgICAgICAgICAgW2ZpbHRlciBzZXRWYWx1ZTpAWUVTIGZvcktl eTpAImlucHV0Tm9ybWFsaXplRWRnZXMiXTsKICNlbmRpZgogICAgICAgICAgICAgW2ZpbHRlciBz ZXROYW1lOmZpbHRlck5hbWVdOwogICAgICAgICAgICAgW2FycmF5LmdldCgpIGFkZE9iamVjdDpm aWx0ZXJdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l TWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4 IDVjOWQ3OGZkZDBiLi5jZjY2ZGE4Mjc5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJUaGVtZU1hYy5tbQpAQCAtMTA3Nyw4ICsxMDc3LDcgQEAgTlNMZXZlbEluZGljYXRvckNl bGwqIFJlbmRlclRoZW1lTWFjOjpsZXZlbEluZGljYXRvckZvcihjb25zdCBSZW5kZXJNZXRlciYg cmVuZGUKICAgICBbY2VsbCBzZXRCYXNlV3JpdGluZ0RpcmVjdGlvbjpzdHlsZS5pc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKCkgPyBOU1dyaXRpbmdEaXJlY3Rpb25MZWZ0VG9SaWdodCA6IE5TV3JpdGlu Z0RpcmVjdGlvblJpZ2h0VG9MZWZ0XTsKICAgICBbY2VsbCBzZXRNaW5WYWx1ZTplbGVtZW50LT5t aW4oKV07CiAgICAgW2NlbGwgc2V0TWF4VmFsdWU6ZWxlbWVudC0+bWF4KCldOwotICAgIFJldGFp blB0cjxOU051bWJlcj4gdmFsdWVPYmplY3QgPSBbTlNOdW1iZXIgbnVtYmVyV2l0aERvdWJsZTp2 YWx1ZV07Ci0gICAgW2NlbGwgc2V0T2JqZWN0VmFsdWU6dmFsdWVPYmplY3QuZ2V0KCldOworICAg IFtjZWxsIHNldE9iamVjdFZhbHVlOkAodmFsdWUpXTsKIAogICAgIHJldHVybiBjZWxsOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCmluZGV4IDBmNmVjYmUyNjE5Li5mMWFmZTY4YjZiNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1 ICsxLDE5IEBACiAyMDE3LTA1LTI2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5j b20+CiAKKyAgICAgICAgU2ltcGx5IHNvbWUgTlNOdW1iZXIgdXNhZ2UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MjY3NworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9tYWMvUGx1 Z2luQ29udHJvbGxlclByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Db250cm9s bGVyUHJveHk6OnBsYXRmb3JtR2VvbWV0cnlEaWRDaGFuZ2UpOgorICAgICAgICAqIFVJUHJvY2Vz cy9Db2NvYS9XZWJQcm9jZXNzUG9vbENvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpyZWdpc3Rl clVzZXJEZWZhdWx0c0lmTmVlZGVkKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3RNYWMubW06CisgICAgICAgICgtW1dLQWNjZXNz aWJpbGl0eVdlYlBhZ2VPYmplY3QgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorCisy MDE3LTA1LTI2ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAg ICAgW0NvY29hXSBTaW1wbGlmeSBzb21lIFdlYlZpZXdJbXBsIHBhc3RlYm9hcmQgY29kZQogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcyNjY4CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpbkNvbnRyb2xs ZXJQcm94eU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpbkNv bnRyb2xsZXJQcm94eU1hYy5tbQppbmRleCBjZmUyN2MxNTlmNC4uZTU5MGM5NjczNzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvbWFjL1BsdWdpbkNvbnRyb2xsZXJQ cm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL21hYy9QbHVnaW5D b250cm9sbGVyUHJveHlNYWMubW0KQEAgLTg1LDcgKzg1LDcgQEAgdm9pZCBQbHVnaW5Db250cm9s bGVyUHJveHk6OnBsYXRmb3JtR2VvbWV0cnlEaWRDaGFuZ2UoKQogCiAgICAgLy8gV2UgZG9uJ3Qg d2FudCB0byBhbmltYXRlIHRvIHRoZSBuZXcgc2l6ZSBzbyB3ZSBkaXNhYmxlIGFjdGlvbnMgZm9y IHRoaXMgdHJhbnNhY3Rpb24uCiAgICAgW0NBVHJhbnNhY3Rpb24gYmVnaW5dOwotICAgIFtDQVRy YW5zYWN0aW9uIHNldFZhbHVlOltOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdIGZvcktleTpr Q0FUcmFuc2FjdGlvbkRpc2FibGVBY3Rpb25zXTsKKyAgICBbQ0FUcmFuc2FjdGlvbiBzZXRWYWx1 ZTpAWUVTIGZvcktleTprQ0FUcmFuc2FjdGlvbkRpc2FibGVBY3Rpb25zXTsKICAgICBbcGx1Z2lu TGF5ZXIgc2V0RnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCBtX3BsdWdpblNpemUud2lkdGgoKSwgbV9w bHVnaW5TaXplLmhlaWdodCgpKV07CiAgICAgW0NBVHJhbnNhY3Rpb24gY29tbWl0XTsKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9XZWJQcm9jZXNzUG9vbENv Y29hLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dlYlByb2Nlc3NQb29sQ29j b2EubW0KaW5kZXggNTE3Y2RiZGQ2MTguLjhhNzdhMzNiYjNjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUHJvY2Vzc1Bvb2xDb2NvYS5tbQpAQCAtMTA1 LDEyICsxMDUsMTIgQEAgc3RhdGljIHZvaWQgcmVnaXN0ZXJVc2VyRGVmYXVsdHNJZk5lZWRlZCgp CiAgICAgZGlkUmVnaXN0ZXIgPSB0cnVlOwogICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKnJlZ2lz dHJhdGlvbkRpY3Rpb25hcnkgPSBbTlNNdXRhYmxlRGljdGlvbmFyeSBkaWN0aW9uYXJ5XTsKICAg ICAKLSAgICBbcmVnaXN0cmF0aW9uRGljdGlvbmFyeSBzZXRPYmplY3Q6W05TTnVtYmVyIG51bWJl cldpdGhCb29sOllFU10gZm9yS2V5OldlYktpdEpTQ0pJVEVuYWJsZWREZWZhdWx0c0tleV07Ci0g ICAgW3JlZ2lzdHJhdGlvbkRpY3Rpb25hcnkgc2V0T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRo Qm9vbDpZRVNdIGZvcktleTpXZWJLaXRKU0NGVExKSVRFbmFibGVkRGVmYXVsdHNLZXldOworICAg IFtyZWdpc3RyYXRpb25EaWN0aW9uYXJ5IHNldE9iamVjdDpAWUVTIGZvcktleTpXZWJLaXRKU0NK SVRFbmFibGVkRGVmYXVsdHNLZXldOworICAgIFtyZWdpc3RyYXRpb25EaWN0aW9uYXJ5IHNldE9i amVjdDpAWUVTIGZvcktleTpXZWJLaXRKU0NGVExKSVRFbmFibGVkRGVmYXVsdHNLZXldOwogCiAj aWYgRU5BQkxFKE5FVFdPUktfQ0FDSEUpCi0gICAgW3JlZ2lzdHJhdGlvbkRpY3Rpb25hcnkgc2V0 T2JqZWN0OltOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdIGZvcktleTpXZWJLaXROZXR3b3Jr Q2FjaGVFbmFibGVkRGVmYXVsdHNLZXldOwotICAgIFtyZWdpc3RyYXRpb25EaWN0aW9uYXJ5IHNl dE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dIGZvcktleTpXZWJLaXROZXR3b3Jr Q2FjaGVFZmZpY2FjeUxvZ2dpbmdFbmFibGVkRGVmYXVsdHNLZXldOworICAgIFtyZWdpc3RyYXRp b25EaWN0aW9uYXJ5IHNldE9iamVjdDpAWUVTIGZvcktleTpXZWJLaXROZXR3b3JrQ2FjaGVFbmFi bGVkRGVmYXVsdHNLZXldOworICAgIFtyZWdpc3RyYXRpb25EaWN0aW9uYXJ5IHNldE9iamVjdDpA Tk8gZm9yS2V5OldlYktpdE5ldHdvcmtDYWNoZUVmZmljYWN5TG9nZ2luZ0VuYWJsZWREZWZhdWx0 c0tleV07CiAjZW5kaWYKIAogICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVs dHNdIHJlZ2lzdGVyRGVmYXVsdHM6cmVnaXN0cmF0aW9uRGljdGlvbmFyeV07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dLQWNjZXNzaWJpbGl0eVdl YlBhZ2VPYmplY3RNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3RNYWMubW0KaW5kZXggOTRjMDljYjNkNjEuLjc4 ZjE4ZjZkMWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3RNYWMubW0KKysrIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0TWFj Lm1tCkBAIC0xMzcsNyArMTM3LDcgQEAgLSAoaWQpYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVl OihOU1N0cmluZyAqKWF0dHJpYnV0ZQogICAgICAgICByZXR1cm4gTlNBY2Nlc3NpYmlsaXR5Um9s ZURlc2NyaXB0aW9uKE5TQWNjZXNzaWJpbGl0eUdyb3VwUm9sZSwgbmlsKTsKICAgICAKICAgICBp ZiAoW2F0dHJpYnV0ZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5Rm9jdXNlZEF0dHJp YnV0ZV0pCi0gICAgICAgIHJldHVybiBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dOworICAg ICAgICByZXR1cm4gQE5POwogICAgIAogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm4g bmlsOwo=