121797 2013-09-23 11:32:32 -0700 Clean up ListHashSet 2013-09-23 12:36:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin buildbot cmarcelo commit-queue rniwa webkit-ews oldest_to_newest 932212 0 andersca 2013-09-23 11:32:32 -0700 Clean up ListHashSet 932216 1 212372 andersca 2013-09-23 11:37:10 -0700 Created attachment 212372 Patch 932217 2 commit-queue 2013-09-23 11:40:15 -0700 Attachment 212372 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/ListHashSet.h']" exit_code: 1 Source/WTF/wtf/ListHashSet.h:545: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/ListHashSet.h:555: Missing spaces around >> [whitespace/operators] [3] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 932221 3 212372 webkit-ews 2013-09-23 11:47:48 -0700 Comment on attachment 212372 Patch Attachment 212372 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/2110041 932222 4 212372 webkit-ews 2013-09-23 11:49:33 -0700 Comment on attachment 212372 Patch Attachment 212372 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1864493 932225 5 212372 buildbot 2013-09-23 11:56:44 -0700 Comment on attachment 212372 Patch Attachment 212372 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-queues.appspot.com/results/1976055 932231 6 212376 andersca 2013-09-23 12:08:56 -0700 Created attachment 212376 Patch 932233 7 commit-queue 2013-09-23 12:11:14 -0700 Attachment 212376 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/ListHashSet.h']" exit_code: 1 Source/WTF/wtf/ListHashSet.h:545: Missing spaces around >> [whitespace/operators] [3] Source/WTF/wtf/ListHashSet.h:555: Missing spaces around >> [whitespace/operators] [3] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 932247 8 andersca 2013-09-23 12:36:48 -0700 Committed r156283: <http://trac.webkit.org/changeset/156283> 212372 2013-09-23 11:37:10 -0700 2013-09-23 12:08:52 -0700 Patch bug-121797-20130923113710.patch text/plain 10644 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDRkM2VjYjQ1YWRjOWU4MjM2Y2JjZDdl M2M5ZTNkZTU4YzZlYmEyN2UuLmRkM2JiYzZmOGY2NjM2Y2ZiNGIyN2MzYzhkYTcxMTA4MGYwN2Jh MWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTMtMDktMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbiB1cCBMaXN0SGFzaFNldAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNzk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvTGlzdEhhc2hT ZXQuaDoKKworMjAxMy0wOS0yMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgorCiAgICAgICAgIExpc3RIYXNoU2V0IHNob3VsZCB1c2Ugc3RkOjpyZXZlcnNlX2l0ZXJhdG9y IGZvciByZXZlcnNlIGl0ZXJhdG9ycwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIxNzk1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xpc3RI YXNoU2V0LmggYi9Tb3VyY2UvV1RGL3d0Zi9MaXN0SGFzaFNldC5oCmluZGV4IDA5ZDg5NmQxODk0 ODFmNjEzOTE1M2RmODJmNmNhOGFlNWIyNDIxNzQuLjlmM2JlNjY0ZTg3ZTNhNDNlMGZiNzUyOTFl ODQ3ZjNhNDA4ZmI0ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xpc3RIYXNoU2V0LmgK KysrIGIvU291cmNlL1dURi93dGYvTGlzdEhhc2hTZXQuaApAQCAtNjIsMTAgKzYyLDYgQEAgcHJp dmF0ZToKICAgICB0eXBlZGVmIExpc3RIYXNoU2V0Tm9kZUhhc2hGdW5jdGlvbnM8SGFzaEFyZz4g Tm9kZUhhc2g7CiAgICAgdHlwZWRlZiBMaXN0SGFzaFNldFRyYW5zbGF0b3I8SGFzaEFyZz4gQmFz ZVRyYW5zbGF0b3I7CiAKLSAgICB0eXBlZGVmIEhhc2hUYWJsZTxOb2RlKiwgTm9kZSosIElkZW50 aXR5RXh0cmFjdG9yLCBOb2RlSGFzaCwgTm9kZVRyYWl0cywgTm9kZVRyYWl0cz4gSW1wbFR5cGU7 Ci0gICAgdHlwZWRlZiBIYXNoVGFibGVJdGVyYXRvcjxOb2RlKiwgTm9kZSosIElkZW50aXR5RXh0 cmFjdG9yLCBOb2RlSGFzaCwgTm9kZVRyYWl0cywgTm9kZVRyYWl0cz4gSW1wbFR5cGVJdGVyYXRv cjsKLSAgICB0eXBlZGVmIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3I8Tm9kZSosIE5vZGUqLCBJZGVu dGl0eUV4dHJhY3RvciwgTm9kZUhhc2gsIE5vZGVUcmFpdHMsIE5vZGVUcmFpdHM+IEltcGxUeXBl Q29uc3RJdGVyYXRvcjsKLQogICAgIHR5cGVkZWYgSGFzaEFyZyBIYXNoRnVuY3Rpb25zOwogCiBw dWJsaWM6CkBAIC05MSwxMCArODcsMTAgQEAgcHVibGljOgogICAgIGludCBjYXBhY2l0eSgpIGNv bnN0OwogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0OwogCi0gICAgaXRlcmF0b3IgYmVnaW4oKTsK LSAgICBpdGVyYXRvciBlbmQoKTsKLSAgICBjb25zdF9pdGVyYXRvciBiZWdpbigpIGNvbnN0Owot ICAgIGNvbnN0X2l0ZXJhdG9yIGVuZCgpIGNvbnN0OworICAgIGl0ZXJhdG9yIGJlZ2luKCkgeyBy ZXR1cm4gbWFrZUl0ZXJhdG9yKG1faGVhZCk7IH0KKyAgICBpdGVyYXRvciBlbmQoKSB7IHJldHVy biBtYWtlSXRlcmF0b3IobnVsbHB0cik7IH0KKyAgICBjb25zdF9pdGVyYXRvciBiZWdpbigpIGNv bnN0IHsgcmV0dXJuIG1ha2VDb25zdEl0ZXJhdG9yKG1faGVhZCk7IH0KKyAgICBjb25zdF9pdGVy YXRvciBlbmQoKSBjb25zdCB7IHJldHVybiBtYWtlQ29uc3RJdGVyYXRvcihudWxscHRyKTsgfQog CiAgICAgcmV2ZXJzZV9pdGVyYXRvciByYmVnaW4oKSB7IHJldHVybiByZXZlcnNlX2l0ZXJhdG9y KGVuZCgpKTsgfQogICAgIHJldmVyc2VfaXRlcmF0b3IgcmVuZCgpIHsgcmV0dXJuIHJldmVyc2Vf aXRlcmF0b3IoYmVnaW4oKSk7IH0KQEAgLTE1Niw3ICsxNTIsNyBAQCBwcml2YXRlOgogCiAgICAg ZnJpZW5kIHZvaWQgZGVsZXRlQWxsVmFsdWVzPD4oY29uc3QgTGlzdEhhc2hTZXQmKTsKIAotICAg IEltcGxUeXBlIG1faW1wbDsKKyAgICBIYXNoVGFibGU8Tm9kZSosIE5vZGUqLCBJZGVudGl0eUV4 dHJhY3RvciwgTm9kZUhhc2gsIE5vZGVUcmFpdHMsIE5vZGVUcmFpdHM+IG1faW1wbDsKICAgICBO b2RlKiBtX2hlYWQ7CiAgICAgTm9kZSogbV90YWlsOwogICAgIE93blB0cjxOb2RlQWxsb2NhdG9y PiBtX2FsbG9jYXRvcjsKQEAgLTQxMyw4ICs0MDksNyBAQCBpbmxpbmUgTGlzdEhhc2hTZXQ8VCwg aW5saW5lQ2FwYWNpdHksIFU+OjpMaXN0SGFzaFNldChjb25zdCBMaXN0SGFzaFNldCYgb3RoZXIp CiAgICAgLCBtX3RhaWwoMCkKICAgICAsIG1fYWxsb2NhdG9yKGNyZWF0ZU93bmVkPE5vZGVBbGxv Y2F0b3I+KCkpCiB7Ci0gICAgY29uc3RfaXRlcmF0b3IgZW5kID0gb3RoZXIuZW5kKCk7Ci0gICAg Zm9yIChjb25zdF9pdGVyYXRvciBpdCA9IG90aGVyLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkK KyAgICBmb3IgKGF1dG8gaXQgPSBvdGhlci5iZWdpbigpLCBlbmQgPSBvdGhlci5lbmQoKTsgaXQg IT0gZW5kOyArK2l0KQogICAgICAgICBhZGQoKml0KTsKIH0KIApAQCAtNDYwLDMwICs0NTUsNiBA QCBpbmxpbmUgYm9vbCBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmlzRW1wdHko KSBjb25zdAogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHks IHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNp dHksIFU+OjppdGVyYXRvciBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmJlZ2lu KCkKLXsKLSAgICByZXR1cm4gbWFrZUl0ZXJhdG9yKG1faGVhZCk7IAotfQotCi10ZW1wbGF0ZTx0 eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlw ZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjppdGVyYXRvciBMaXN0SGFz aFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmVuZCgpCi17Ci0gICAgcmV0dXJuIG1ha2VJdGVy YXRvcigwKTsKLX0KLQotdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5 LCB0eXBlbmFtZSBVPgotaW5saW5lIHR5cGVuYW1lIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFj aXR5LCBVPjo6Y29uc3RfaXRlcmF0b3IgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+ OjpiZWdpbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1ha2VDb25zdEl0ZXJhdG9yKG1faGVhZCk7 IAotfQotCi10ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVu YW1lIFU+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+ Ojpjb25zdF9pdGVyYXRvciBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmVuZCgp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1ha2VDb25zdEl0ZXJhdG9yKDApOyAKLX0KLQotdGVtcGxh dGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgogaW5saW5l IFQmIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6Zmlyc3QoKQogewogICAgIEFT U0VSVCghaXNFbXB0eSgpKTsKQEAgLTU0NCwxOCArNTE1LDE4IEBAIGlubGluZSBUIExpc3RIYXNo U2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6dGFrZUxhc3QoKQogfQogCiB0ZW1wbGF0ZTx0eXBl bmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlwZW5h bWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjppdGVyYXRvciBMaXN0SGFzaFNl dDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmZpbmQoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkKK2lu bGluZSBhdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6ZmluZChjb25zdCBW YWx1ZVR5cGUmIHZhbHVlKSAtPiBpdGVyYXRvcgogewotICAgIEltcGxUeXBlSXRlcmF0b3IgaXQg PSBtX2ltcGwudGVtcGxhdGUgZmluZDxCYXNlVHJhbnNsYXRvcj4odmFsdWUpOworICAgIGF1dG8g aXQgPSBtX2ltcGwudGVtcGxhdGUgZmluZDxCYXNlVHJhbnNsYXRvcj4odmFsdWUpOwogICAgIGlm IChpdCA9PSBtX2ltcGwuZW5kKCkpCiAgICAgICAgIHJldHVybiBlbmQoKTsKICAgICByZXR1cm4g bWFrZUl0ZXJhdG9yKCppdCk7IAogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5s aW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwg aW5saW5lQ2FwYWNpdHksIFU+Ojpjb25zdF9pdGVyYXRvciBMaXN0SGFzaFNldDxULCBpbmxpbmVD YXBhY2l0eSwgVT46OmZpbmQoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkgY29uc3QKK2lubGluZSBh dXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6ZmluZChjb25zdCBWYWx1ZVR5 cGUmIHZhbHVlKSBjb25zdCAtPiBjb25zdF9pdGVyYXRvcgogewotICAgIEltcGxUeXBlQ29uc3RJ dGVyYXRvciBpdCA9IG1faW1wbC50ZW1wbGF0ZSBmaW5kPEJhc2VUcmFuc2xhdG9yPih2YWx1ZSk7 CisgICAgYXV0byBpdCA9IG1faW1wbC50ZW1wbGF0ZSBmaW5kPEJhc2VUcmFuc2xhdG9yPih2YWx1 ZSk7CiAgICAgaWYgKGl0ID09IG1faW1wbC5lbmQoKSkKICAgICAgICAgcmV0dXJuIGVuZCgpOwog ICAgIHJldHVybiBtYWtlQ29uc3RJdGVyYXRvcigqaXQpOwpAQCAtNTY5LDkgKzU0MCw5IEBAIHN0 cnVjdCBMaXN0SGFzaFNldFRyYW5zbGF0b3JBZGFwdGVyIHsKIAogdGVtcGxhdGU8dHlwZW5hbWUg VmFsdWVUeXBlLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+CiB0ZW1wbGF0ZTx0 eXBlbmFtZSBULCB0eXBlbmFtZSBIYXNoVHJhbnNsYXRvcj4KLWlubGluZSB0eXBlbmFtZSBMaXN0 SGFzaFNldDxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBVPjo6aXRlcmF0b3IgTGlzdEhhc2hT ZXQ8VmFsdWVUeXBlLCBpbmxpbmVDYXBhY2l0eSwgVT46OmZpbmQoY29uc3QgVCYgdmFsdWUpCitp bmxpbmUgYXV0byBMaXN0SGFzaFNldDxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBVPjo6Zmlu ZChjb25zdCBUJiB2YWx1ZSkgLT4gaXRlcmF0b3IKIHsKLSAgICBJbXBsVHlwZUNvbnN0SXRlcmF0 b3IgaXQgPSBtX2ltcGwudGVtcGxhdGUgZmluZDxMaXN0SGFzaFNldFRyYW5zbGF0b3JBZGFwdGVy PEhhc2hUcmFuc2xhdG9yPiA+KHZhbHVlKTsKKyAgICBhdXRvIGl0ID0gbV9pbXBsLnRlbXBsYXRl IGZpbmQ8TGlzdEhhc2hTZXRUcmFuc2xhdG9yQWRhcHRlcjxIYXNoVHJhbnNsYXRvcj4+KHZhbHVl KTsKICAgICBpZiAoaXQgPT0gbV9pbXBsLmVuZCgpKQogICAgICAgICByZXR1cm4gZW5kKCk7CiAg ICAgcmV0dXJuIG1ha2VJdGVyYXRvcigqaXQpOwpAQCAtNTc5LDkgKzU1MCw5IEBAIGlubGluZSB0 eXBlbmFtZSBMaXN0SGFzaFNldDxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBVPjo6aXRlcmF0 b3IgTGlzdEhhc2hTZXQ8CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVlVHlwZSwgc2l6ZV90IGlu bGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgogdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUg SGFzaFRyYW5zbGF0b3I+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VmFsdWVUeXBlLCBp bmxpbmVDYXBhY2l0eSwgVT46OmNvbnN0X2l0ZXJhdG9yIExpc3RIYXNoU2V0PFZhbHVlVHlwZSwg aW5saW5lQ2FwYWNpdHksIFU+OjpmaW5kKGNvbnN0IFQmIHZhbHVlKSBjb25zdAoraW5saW5lIGF1 dG8gTGlzdEhhc2hTZXQ8VmFsdWVUeXBlLCBpbmxpbmVDYXBhY2l0eSwgVT46OmZpbmQoY29uc3Qg VCYgdmFsdWUpIGNvbnN0IC0+IGNvbnN0X2l0ZXJhdG9yCiB7Ci0gICAgSW1wbFR5cGVDb25zdEl0 ZXJhdG9yIGl0ID0gbV9pbXBsLnRlbXBsYXRlIGZpbmQ8TGlzdEhhc2hTZXRUcmFuc2xhdG9yQWRh cHRlcjxIYXNoVHJhbnNsYXRvcj4gPih2YWx1ZSk7CisgICAgYXV0byBpdCA9IG1faW1wbC50ZW1w bGF0ZSBmaW5kPExpc3RIYXNoU2V0VHJhbnNsYXRvckFkYXB0ZXI8SGFzaFRyYW5zbGF0b3I+Pih2 YWx1ZSk7CiAgICAgaWYgKGl0ID09IG1faW1wbC5lbmQoKSkKICAgICAgICAgcmV0dXJuIGVuZCgp OwogICAgIHJldHVybiBtYWtlQ29uc3RJdGVyYXRvcigqaXQpOwpAQCAtNjAxLDQ3ICs1NzIsNDkg QEAgaW5saW5lIGJvb2wgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+Ojpjb250YWlu cyhjb25zdCBWYWx1ZVR5cGUmIHZhbHVlKQogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXpl X3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci10eXBlbmFtZSBMaXN0SGFzaFNldDxULCBp bmxpbmVDYXBhY2l0eSwgVT46OkFkZFJlc3VsdCBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0 eSwgVT46OmFkZChjb25zdCBWYWx1ZVR5cGUgJnZhbHVlKQorYXV0byBMaXN0SGFzaFNldDxULCBp bmxpbmVDYXBhY2l0eSwgVT46OmFkZChjb25zdCBWYWx1ZVR5cGUgJnZhbHVlKSAtPiBBZGRSZXN1 bHQKIHsKLSAgICB0eXBlbmFtZSBJbXBsVHlwZTo6QWRkUmVzdWx0IHJlc3VsdCA9IG1faW1wbC50 ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVlLCBtX2FsbG9jYXRvci5nZXQoKSk7Cisg ICAgYXV0byByZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPih2YWx1 ZSwgbV9hbGxvY2F0b3IuZ2V0KCkpOwogICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKICAgICAg ICAgYXBwZW5kTm9kZSgqcmVzdWx0Lml0ZXJhdG9yKTsKICAgICByZXR1cm4gQWRkUmVzdWx0KG1h a2VJdGVyYXRvcigqcmVzdWx0Lml0ZXJhdG9yKSwgcmVzdWx0LmlzTmV3RW50cnkpOwogfQogCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci10 eXBlbmFtZSBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OkFkZFJlc3VsdCBMaXN0 SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmFwcGVuZE9yTW92ZVRvTGFzdChjb25zdCBW YWx1ZVR5cGUgJnZhbHVlKQorYXV0byBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46 OmFwcGVuZE9yTW92ZVRvTGFzdChjb25zdCBWYWx1ZVR5cGUgJnZhbHVlKSAtPiBBZGRSZXN1bHQK IHsKLSAgICB0eXBlbmFtZSBJbXBsVHlwZTo6QWRkUmVzdWx0IHJlc3VsdCA9IG1faW1wbC50ZW1w bGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVlLCBtX2FsbG9jYXRvci5nZXQoKSk7CisgICAg YXV0byByZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPih2YWx1ZSwg bV9hbGxvY2F0b3IuZ2V0KCkpOwogICAgIE5vZGUqIG5vZGUgPSAqcmVzdWx0Lml0ZXJhdG9yOwog ICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpCiAgICAgICAgIHVubGluayhub2RlKTsKICAgICBh cHBlbmROb2RlKG5vZGUpOworCiAgICAgcmV0dXJuIEFkZFJlc3VsdChtYWtlSXRlcmF0b3IoKnJl c3VsdC5pdGVyYXRvciksIHJlc3VsdC5pc05ld0VudHJ5KTsKIH0KIAogdGVtcGxhdGU8dHlwZW5h bWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgotdHlwZW5hbWUgTGlzdEhh c2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpBZGRSZXN1bHQgTGlzdEhhc2hTZXQ8VCwgaW5s aW5lQ2FwYWNpdHksIFU+OjpwcmVwZW5kT3JNb3ZlVG9GaXJzdChjb25zdCBWYWx1ZVR5cGUgJnZh bHVlKQorYXV0byBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OnByZXBlbmRPck1v dmVUb0ZpcnN0KGNvbnN0IFZhbHVlVHlwZSAmdmFsdWUpIC0+IEFkZFJlc3VsdAogewotICAgIHR5 cGVuYW1lIEltcGxUeXBlOjpBZGRSZXN1bHQgcmVzdWx0ID0gbV9pbXBsLnRlbXBsYXRlIGFkZDxC YXNlVHJhbnNsYXRvcj4odmFsdWUsIG1fYWxsb2NhdG9yLmdldCgpKTsKKyAgICBhdXRvIHJlc3Vs dCA9IG1faW1wbC50ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVlLCBtX2FsbG9jYXRv ci5nZXQoKSk7CiAgICAgTm9kZSogbm9kZSA9ICpyZXN1bHQuaXRlcmF0b3I7CiAgICAgaWYgKCFy ZXN1bHQuaXNOZXdFbnRyeSkKICAgICAgICAgdW5saW5rKG5vZGUpOwogICAgIHByZXBlbmROb2Rl KG5vZGUpOworCiAgICAgcmV0dXJuIEFkZFJlc3VsdChtYWtlSXRlcmF0b3IoKnJlc3VsdC5pdGVy YXRvciksIHJlc3VsdC5pc05ld0VudHJ5KTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6 ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgotdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwg aW5saW5lQ2FwYWNpdHksIFU+OjpBZGRSZXN1bHQgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNp dHksIFU+OjppbnNlcnRCZWZvcmUoaXRlcmF0b3IgaXQsIGNvbnN0IFZhbHVlVHlwZSYgbmV3VmFs dWUpCithdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6aW5zZXJ0QmVmb3Jl KGl0ZXJhdG9yIGl0LCBjb25zdCBWYWx1ZVR5cGUmIG5ld1ZhbHVlKSAtPiBBZGRSZXN1bHQKIHsK LSAgICB0eXBlbmFtZSBJbXBsVHlwZTo6QWRkUmVzdWx0IHJlc3VsdCA9IG1faW1wbC50ZW1wbGF0 ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KG5ld1ZhbHVlLCBtX2FsbG9jYXRvci5nZXQoKSk7CisgICAg YXV0byByZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPihuZXdWYWx1 ZSwgbV9hbGxvY2F0b3IuZ2V0KCkpOwogICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKICAgICAg ICAgaW5zZXJ0Tm9kZUJlZm9yZShpdC5ub2RlKCksICpyZXN1bHQuaXRlcmF0b3IpOwogICAgIHJl dHVybiBBZGRSZXN1bHQobWFrZUl0ZXJhdG9yKCpyZXN1bHQuaXRlcmF0b3IpLCByZXN1bHQuaXNO ZXdFbnRyeSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0 eSwgdHlwZW5hbWUgVT4KLXR5cGVuYW1lIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBV Pjo6QWRkUmVzdWx0IExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6aW5zZXJ0QmVm b3JlKGNvbnN0IFZhbHVlVHlwZSYgYmVmb3JlVmFsdWUsIGNvbnN0IFZhbHVlVHlwZSYgbmV3VmFs dWUpCithdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6aW5zZXJ0QmVmb3Jl KGNvbnN0IFZhbHVlVHlwZSYgYmVmb3JlVmFsdWUsIGNvbnN0IFZhbHVlVHlwZSYgbmV3VmFsdWUp IC0+IEFkZFJlc3VsdAogewogICAgIHJldHVybiBpbnNlcnRCZWZvcmUoZmluZChiZWZvcmVWYWx1 ZSksIG5ld1ZhbHVlKTsgCiB9CkBAIC03NTYsMjIgKzcyOSwyMyBAQCB2b2lkIExpc3RIYXNoU2V0 PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6ZGVsZXRlQWxsTm9kZXMoKQogfQogCiB0ZW1wbGF0ZTx0 eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgTGlz dEhhc2hTZXRJdGVyYXRvcjxULCBpbmxpbmVDYXBhY2l0eSwgVT4gTGlzdEhhc2hTZXQ8VCwgaW5s aW5lQ2FwYWNpdHksIFU+OjptYWtlSXRlcmF0b3IoTm9kZSogcG9zaXRpb24pIAoraW5saW5lIGF1 dG8gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjptYWtlSXRlcmF0b3IoTm9kZSog cG9zaXRpb24pIC0+IGl0ZXJhdG9yCiB7Ci0gICAgcmV0dXJuIExpc3RIYXNoU2V0SXRlcmF0b3I8 VCwgaW5saW5lQ2FwYWNpdHksIFU+KHRoaXMsIHBvc2l0aW9uKTsgCisgICAgcmV0dXJuIGl0ZXJh dG9yKHRoaXMsIHBvc2l0aW9uKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlu bGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgotaW5saW5lIExpc3RIYXNoU2V0Q29uc3RJdGVyYXRv cjxULCBpbmxpbmVDYXBhY2l0eSwgVT4gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+ OjptYWtlQ29uc3RJdGVyYXRvcihOb2RlKiBwb3NpdGlvbikgY29uc3QKK2lubGluZSBhdXRvIExp c3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6bWFrZUNvbnN0SXRlcmF0b3IoTm9kZSog cG9zaXRpb24pIGNvbnN0IC0+IGNvbnN0X2l0ZXJhdG9yCiB7IAotICAgIHJldHVybiBMaXN0SGFz aFNldENvbnN0SXRlcmF0b3I8VCwgaW5saW5lQ2FwYWNpdHksIFU+KHRoaXMsIHBvc2l0aW9uKTsg CisgICAgcmV0dXJuIGNvbnN0X2l0ZXJhdG9yKHRoaXMsIHBvc2l0aW9uKTsKIH0KKwogdGVtcGxh dGU8Ym9vbCwgdHlwZW5hbWUgVmFsdWVUeXBlLCB0eXBlbmFtZSBIYXNoVGFibGVUeXBlPgogdm9p ZCBkZWxldGVBbGxWYWx1ZXMoSGFzaFRhYmxlVHlwZSYgY29sbGVjdGlvbikKIHsKICAgICB0eXBl ZGVmIHR5cGVuYW1lIEhhc2hUYWJsZVR5cGU6OmNvbnN0X2l0ZXJhdG9yIGl0ZXJhdG9yOwogICAg IGl0ZXJhdG9yIGVuZCA9IGNvbGxlY3Rpb24uZW5kKCk7Ci0gICAgZm9yIChpdGVyYXRvciBpdCA9 IGNvbGxlY3Rpb24uYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQorICAgIGZvciAoYXV0byBpdCA9 IGNvbGxlY3Rpb24uYmVnaW4oKSwgZW5kID0gY29sbGVjdGlvbi5lbmQoKTsgaXQgIT0gZW5kOyAr K2l0KQogICAgICAgICBkZWxldGUgKCppdCktPm1fdmFsdWU7CiB9CiAK 212376 2013-09-23 12:08:56 -0700 2013-09-23 12:24:15 -0700 Patch bug-121797-20130923120855.patch text/plain 10644 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MjgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDRkM2VjYjQ1YWRjOWU4MjM2Y2JjZDdl M2M5ZTNkZTU4YzZlYmEyN2UuLmYwZjJlZDkyODMxNjZjMTlkMTIwNDZkN2JjYjIxYTEzMWQ4ZWIw NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTMtMDktMjMgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAgICBDbGVhbiB1cCBMaXN0SGFzaFNldAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIxNzk3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgKiB3dGYvTGlzdEhhc2hT ZXQuaDoKKworMjAxMy0wOS0yMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29t PgorCiAgICAgICAgIExpc3RIYXNoU2V0IHNob3VsZCB1c2Ugc3RkOjpyZXZlcnNlX2l0ZXJhdG9y IGZvciByZXZlcnNlIGl0ZXJhdG9ycwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTIxNzk1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0xpc3RI YXNoU2V0LmggYi9Tb3VyY2UvV1RGL3d0Zi9MaXN0SGFzaFNldC5oCmluZGV4IDA5ZDg5NmQxODk0 ODFmNjEzOTE1M2RmODJmNmNhOGFlNWIyNDIxNzQuLjkzMjZjZDM0ODY4YmE5MTA3ODk2NjY2M2I0 N2M0ODU3MzgyM2ZkZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0xpc3RIYXNoU2V0LmgK KysrIGIvU291cmNlL1dURi93dGYvTGlzdEhhc2hTZXQuaApAQCAtNjIsMTAgKzYyLDYgQEAgcHJp dmF0ZToKICAgICB0eXBlZGVmIExpc3RIYXNoU2V0Tm9kZUhhc2hGdW5jdGlvbnM8SGFzaEFyZz4g Tm9kZUhhc2g7CiAgICAgdHlwZWRlZiBMaXN0SGFzaFNldFRyYW5zbGF0b3I8SGFzaEFyZz4gQmFz ZVRyYW5zbGF0b3I7CiAKLSAgICB0eXBlZGVmIEhhc2hUYWJsZTxOb2RlKiwgTm9kZSosIElkZW50 aXR5RXh0cmFjdG9yLCBOb2RlSGFzaCwgTm9kZVRyYWl0cywgTm9kZVRyYWl0cz4gSW1wbFR5cGU7 Ci0gICAgdHlwZWRlZiBIYXNoVGFibGVJdGVyYXRvcjxOb2RlKiwgTm9kZSosIElkZW50aXR5RXh0 cmFjdG9yLCBOb2RlSGFzaCwgTm9kZVRyYWl0cywgTm9kZVRyYWl0cz4gSW1wbFR5cGVJdGVyYXRv cjsKLSAgICB0eXBlZGVmIEhhc2hUYWJsZUNvbnN0SXRlcmF0b3I8Tm9kZSosIE5vZGUqLCBJZGVu dGl0eUV4dHJhY3RvciwgTm9kZUhhc2gsIE5vZGVUcmFpdHMsIE5vZGVUcmFpdHM+IEltcGxUeXBl Q29uc3RJdGVyYXRvcjsKLQogICAgIHR5cGVkZWYgSGFzaEFyZyBIYXNoRnVuY3Rpb25zOwogCiBw dWJsaWM6CkBAIC05MSwxMCArODcsMTAgQEAgcHVibGljOgogICAgIGludCBjYXBhY2l0eSgpIGNv bnN0OwogICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0OwogCi0gICAgaXRlcmF0b3IgYmVnaW4oKTsK LSAgICBpdGVyYXRvciBlbmQoKTsKLSAgICBjb25zdF9pdGVyYXRvciBiZWdpbigpIGNvbnN0Owot ICAgIGNvbnN0X2l0ZXJhdG9yIGVuZCgpIGNvbnN0OworICAgIGl0ZXJhdG9yIGJlZ2luKCkgeyBy ZXR1cm4gbWFrZUl0ZXJhdG9yKG1faGVhZCk7IH0KKyAgICBpdGVyYXRvciBlbmQoKSB7IHJldHVy biBtYWtlSXRlcmF0b3IobnVsbHB0cik7IH0KKyAgICBjb25zdF9pdGVyYXRvciBiZWdpbigpIGNv bnN0IHsgcmV0dXJuIG1ha2VDb25zdEl0ZXJhdG9yKG1faGVhZCk7IH0KKyAgICBjb25zdF9pdGVy YXRvciBlbmQoKSBjb25zdCB7IHJldHVybiBtYWtlQ29uc3RJdGVyYXRvcihudWxscHRyKTsgfQog CiAgICAgcmV2ZXJzZV9pdGVyYXRvciByYmVnaW4oKSB7IHJldHVybiByZXZlcnNlX2l0ZXJhdG9y KGVuZCgpKTsgfQogICAgIHJldmVyc2VfaXRlcmF0b3IgcmVuZCgpIHsgcmV0dXJuIHJldmVyc2Vf aXRlcmF0b3IoYmVnaW4oKSk7IH0KQEAgLTE1Niw3ICsxNTIsNyBAQCBwcml2YXRlOgogCiAgICAg ZnJpZW5kIHZvaWQgZGVsZXRlQWxsVmFsdWVzPD4oY29uc3QgTGlzdEhhc2hTZXQmKTsKIAotICAg IEltcGxUeXBlIG1faW1wbDsKKyAgICBIYXNoVGFibGU8Tm9kZSosIE5vZGUqLCBJZGVudGl0eUV4 dHJhY3RvciwgTm9kZUhhc2gsIE5vZGVUcmFpdHMsIE5vZGVUcmFpdHM+IG1faW1wbDsKICAgICBO b2RlKiBtX2hlYWQ7CiAgICAgTm9kZSogbV90YWlsOwogICAgIE93blB0cjxOb2RlQWxsb2NhdG9y PiBtX2FsbG9jYXRvcjsKQEAgLTQxMyw4ICs0MDksNyBAQCBpbmxpbmUgTGlzdEhhc2hTZXQ8VCwg aW5saW5lQ2FwYWNpdHksIFU+OjpMaXN0SGFzaFNldChjb25zdCBMaXN0SGFzaFNldCYgb3RoZXIp CiAgICAgLCBtX3RhaWwoMCkKICAgICAsIG1fYWxsb2NhdG9yKGNyZWF0ZU93bmVkPE5vZGVBbGxv Y2F0b3I+KCkpCiB7Ci0gICAgY29uc3RfaXRlcmF0b3IgZW5kID0gb3RoZXIuZW5kKCk7Ci0gICAg Zm9yIChjb25zdF9pdGVyYXRvciBpdCA9IG90aGVyLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkK KyAgICBmb3IgKGF1dG8gaXQgPSBvdGhlci5iZWdpbigpLCBlbmQgPSBvdGhlci5lbmQoKTsgaXQg IT0gZW5kOyArK2l0KQogICAgICAgICBhZGQoKml0KTsKIH0KIApAQCAtNDYwLDMwICs0NTUsNiBA QCBpbmxpbmUgYm9vbCBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmlzRW1wdHko KSBjb25zdAogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHks IHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNp dHksIFU+OjppdGVyYXRvciBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmJlZ2lu KCkKLXsKLSAgICByZXR1cm4gbWFrZUl0ZXJhdG9yKG1faGVhZCk7IAotfQotCi10ZW1wbGF0ZTx0 eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlw ZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjppdGVyYXRvciBMaXN0SGFz aFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmVuZCgpCi17Ci0gICAgcmV0dXJuIG1ha2VJdGVy YXRvcigwKTsKLX0KLQotdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5 LCB0eXBlbmFtZSBVPgotaW5saW5lIHR5cGVuYW1lIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFj aXR5LCBVPjo6Y29uc3RfaXRlcmF0b3IgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+ OjpiZWdpbigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1ha2VDb25zdEl0ZXJhdG9yKG1faGVhZCk7 IAotfQotCi10ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVu YW1lIFU+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+ Ojpjb25zdF9pdGVyYXRvciBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmVuZCgp IGNvbnN0Ci17Ci0gICAgcmV0dXJuIG1ha2VDb25zdEl0ZXJhdG9yKDApOyAKLX0KLQotdGVtcGxh dGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgogaW5saW5l IFQmIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6Zmlyc3QoKQogewogICAgIEFT U0VSVCghaXNFbXB0eSgpKTsKQEAgLTU0NCwxOCArNTE1LDE4IEBAIGlubGluZSBUIExpc3RIYXNo U2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6dGFrZUxhc3QoKQogfQogCiB0ZW1wbGF0ZTx0eXBl bmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlwZW5h bWUgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjppdGVyYXRvciBMaXN0SGFzaFNl dDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmZpbmQoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkKK2lu bGluZSBhdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6ZmluZChjb25zdCBW YWx1ZVR5cGUmIHZhbHVlKSAtPiBpdGVyYXRvcgogewotICAgIEltcGxUeXBlSXRlcmF0b3IgaXQg PSBtX2ltcGwudGVtcGxhdGUgZmluZDxCYXNlVHJhbnNsYXRvcj4odmFsdWUpOworICAgIGF1dG8g aXQgPSBtX2ltcGwudGVtcGxhdGUgZmluZDxCYXNlVHJhbnNsYXRvcj4odmFsdWUpOwogICAgIGlm IChpdCA9PSBtX2ltcGwuZW5kKCkpCiAgICAgICAgIHJldHVybiBlbmQoKTsKICAgICByZXR1cm4g bWFrZUl0ZXJhdG9yKCppdCk7IAogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5s aW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwg aW5saW5lQ2FwYWNpdHksIFU+Ojpjb25zdF9pdGVyYXRvciBMaXN0SGFzaFNldDxULCBpbmxpbmVD YXBhY2l0eSwgVT46OmZpbmQoY29uc3QgVmFsdWVUeXBlJiB2YWx1ZSkgY29uc3QKK2lubGluZSBh dXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6ZmluZChjb25zdCBWYWx1ZVR5 cGUmIHZhbHVlKSBjb25zdCAtPiBjb25zdF9pdGVyYXRvcgogewotICAgIEltcGxUeXBlQ29uc3RJ dGVyYXRvciBpdCA9IG1faW1wbC50ZW1wbGF0ZSBmaW5kPEJhc2VUcmFuc2xhdG9yPih2YWx1ZSk7 CisgICAgYXV0byBpdCA9IG1faW1wbC50ZW1wbGF0ZSBmaW5kPEJhc2VUcmFuc2xhdG9yPih2YWx1 ZSk7CiAgICAgaWYgKGl0ID09IG1faW1wbC5lbmQoKSkKICAgICAgICAgcmV0dXJuIGVuZCgpOwog ICAgIHJldHVybiBtYWtlQ29uc3RJdGVyYXRvcigqaXQpOwpAQCAtNTY5LDkgKzU0MCw5IEBAIHN0 cnVjdCBMaXN0SGFzaFNldFRyYW5zbGF0b3JBZGFwdGVyIHsKIAogdGVtcGxhdGU8dHlwZW5hbWUg VmFsdWVUeXBlLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+CiB0ZW1wbGF0ZTx0 eXBlbmFtZSBULCB0eXBlbmFtZSBIYXNoVHJhbnNsYXRvcj4KLWlubGluZSB0eXBlbmFtZSBMaXN0 SGFzaFNldDxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBVPjo6aXRlcmF0b3IgTGlzdEhhc2hT ZXQ8VmFsdWVUeXBlLCBpbmxpbmVDYXBhY2l0eSwgVT46OmZpbmQoY29uc3QgVCYgdmFsdWUpCitp bmxpbmUgYXV0byBMaXN0SGFzaFNldDxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBVPjo6Zmlu ZChjb25zdCBUJiB2YWx1ZSkgLT4gaXRlcmF0b3IKIHsKLSAgICBJbXBsVHlwZUNvbnN0SXRlcmF0 b3IgaXQgPSBtX2ltcGwudGVtcGxhdGUgZmluZDxMaXN0SGFzaFNldFRyYW5zbGF0b3JBZGFwdGVy PEhhc2hUcmFuc2xhdG9yPiA+KHZhbHVlKTsKKyAgICBhdXRvIGl0ID0gbV9pbXBsLnRlbXBsYXRl IGZpbmQ8TGlzdEhhc2hTZXRUcmFuc2xhdG9yQWRhcHRlcjxIYXNoVHJhbnNsYXRvcj4+KHZhbHVl KTsKICAgICBpZiAoaXQgPT0gbV9pbXBsLmVuZCgpKQogICAgICAgICByZXR1cm4gZW5kKCk7CiAg ICAgcmV0dXJuIG1ha2VJdGVyYXRvcigqaXQpOwpAQCAtNTc5LDkgKzU1MCw5IEBAIGlubGluZSB0 eXBlbmFtZSBMaXN0SGFzaFNldDxWYWx1ZVR5cGUsIGlubGluZUNhcGFjaXR5LCBVPjo6aXRlcmF0 b3IgTGlzdEhhc2hTZXQ8CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVlVHlwZSwgc2l6ZV90IGlu bGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgogdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUg SGFzaFRyYW5zbGF0b3I+Ci1pbmxpbmUgdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VmFsdWVUeXBlLCBp bmxpbmVDYXBhY2l0eSwgVT46OmNvbnN0X2l0ZXJhdG9yIExpc3RIYXNoU2V0PFZhbHVlVHlwZSwg aW5saW5lQ2FwYWNpdHksIFU+OjpmaW5kKGNvbnN0IFQmIHZhbHVlKSBjb25zdAoraW5saW5lIGF1 dG8gTGlzdEhhc2hTZXQ8VmFsdWVUeXBlLCBpbmxpbmVDYXBhY2l0eSwgVT46OmZpbmQoY29uc3Qg VCYgdmFsdWUpIGNvbnN0IC0+IGNvbnN0X2l0ZXJhdG9yCiB7Ci0gICAgSW1wbFR5cGVDb25zdEl0 ZXJhdG9yIGl0ID0gbV9pbXBsLnRlbXBsYXRlIGZpbmQ8TGlzdEhhc2hTZXRUcmFuc2xhdG9yQWRh cHRlcjxIYXNoVHJhbnNsYXRvcj4gPih2YWx1ZSk7CisgICAgYXV0byBpdCA9IG1faW1wbC50ZW1w bGF0ZSBmaW5kPExpc3RIYXNoU2V0VHJhbnNsYXRvckFkYXB0ZXI8SGFzaFRyYW5zbGF0b3I+Pih2 YWx1ZSk7CiAgICAgaWYgKGl0ID09IG1faW1wbC5lbmQoKSkKICAgICAgICAgcmV0dXJuIGVuZCgp OwogICAgIHJldHVybiBtYWtlQ29uc3RJdGVyYXRvcigqaXQpOwpAQCAtNjAxLDQ3ICs1NzIsNDkg QEAgaW5saW5lIGJvb2wgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+Ojpjb250YWlu cyhjb25zdCBWYWx1ZVR5cGUmIHZhbHVlKQogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXpl X3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci10eXBlbmFtZSBMaXN0SGFzaFNldDxULCBp bmxpbmVDYXBhY2l0eSwgVT46OkFkZFJlc3VsdCBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0 eSwgVT46OmFkZChjb25zdCBWYWx1ZVR5cGUgJnZhbHVlKQorYXV0byBMaXN0SGFzaFNldDxULCBp bmxpbmVDYXBhY2l0eSwgVT46OmFkZChjb25zdCBWYWx1ZVR5cGUgJnZhbHVlKSAtPiBBZGRSZXN1 bHQKIHsKLSAgICB0eXBlbmFtZSBJbXBsVHlwZTo6QWRkUmVzdWx0IHJlc3VsdCA9IG1faW1wbC50 ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVlLCBtX2FsbG9jYXRvci5nZXQoKSk7Cisg ICAgYXV0byByZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPih2YWx1 ZSwgbV9hbGxvY2F0b3IuZ2V0KCkpOwogICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKICAgICAg ICAgYXBwZW5kTm9kZSgqcmVzdWx0Lml0ZXJhdG9yKTsKICAgICByZXR1cm4gQWRkUmVzdWx0KG1h a2VJdGVyYXRvcigqcmVzdWx0Lml0ZXJhdG9yKSwgcmVzdWx0LmlzTmV3RW50cnkpOwogfQogCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci10 eXBlbmFtZSBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OkFkZFJlc3VsdCBMaXN0 SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OmFwcGVuZE9yTW92ZVRvTGFzdChjb25zdCBW YWx1ZVR5cGUgJnZhbHVlKQorYXV0byBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46 OmFwcGVuZE9yTW92ZVRvTGFzdChjb25zdCBWYWx1ZVR5cGUgJnZhbHVlKSAtPiBBZGRSZXN1bHQK IHsKLSAgICB0eXBlbmFtZSBJbXBsVHlwZTo6QWRkUmVzdWx0IHJlc3VsdCA9IG1faW1wbC50ZW1w bGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVlLCBtX2FsbG9jYXRvci5nZXQoKSk7CisgICAg YXV0byByZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPih2YWx1ZSwg bV9hbGxvY2F0b3IuZ2V0KCkpOwogICAgIE5vZGUqIG5vZGUgPSAqcmVzdWx0Lml0ZXJhdG9yOwog ICAgIGlmICghcmVzdWx0LmlzTmV3RW50cnkpCiAgICAgICAgIHVubGluayhub2RlKTsKICAgICBh cHBlbmROb2RlKG5vZGUpOworCiAgICAgcmV0dXJuIEFkZFJlc3VsdChtYWtlSXRlcmF0b3IoKnJl c3VsdC5pdGVyYXRvciksIHJlc3VsdC5pc05ld0VudHJ5KTsKIH0KIAogdGVtcGxhdGU8dHlwZW5h bWUgVCwgc2l6ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgotdHlwZW5hbWUgTGlzdEhh c2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjpBZGRSZXN1bHQgTGlzdEhhc2hTZXQ8VCwgaW5s aW5lQ2FwYWNpdHksIFU+OjpwcmVwZW5kT3JNb3ZlVG9GaXJzdChjb25zdCBWYWx1ZVR5cGUgJnZh bHVlKQorYXV0byBMaXN0SGFzaFNldDxULCBpbmxpbmVDYXBhY2l0eSwgVT46OnByZXBlbmRPck1v dmVUb0ZpcnN0KGNvbnN0IFZhbHVlVHlwZSAmdmFsdWUpIC0+IEFkZFJlc3VsdAogewotICAgIHR5 cGVuYW1lIEltcGxUeXBlOjpBZGRSZXN1bHQgcmVzdWx0ID0gbV9pbXBsLnRlbXBsYXRlIGFkZDxC YXNlVHJhbnNsYXRvcj4odmFsdWUsIG1fYWxsb2NhdG9yLmdldCgpKTsKKyAgICBhdXRvIHJlc3Vs dCA9IG1faW1wbC50ZW1wbGF0ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KHZhbHVlLCBtX2FsbG9jYXRv ci5nZXQoKSk7CiAgICAgTm9kZSogbm9kZSA9ICpyZXN1bHQuaXRlcmF0b3I7CiAgICAgaWYgKCFy ZXN1bHQuaXNOZXdFbnRyeSkKICAgICAgICAgdW5saW5rKG5vZGUpOwogICAgIHByZXBlbmROb2Rl KG5vZGUpOworCiAgICAgcmV0dXJuIEFkZFJlc3VsdChtYWtlSXRlcmF0b3IoKnJlc3VsdC5pdGVy YXRvciksIHJlc3VsdC5pc05ld0VudHJ5KTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6 ZV90IGlubGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgotdHlwZW5hbWUgTGlzdEhhc2hTZXQ8VCwg aW5saW5lQ2FwYWNpdHksIFU+OjpBZGRSZXN1bHQgTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNp dHksIFU+OjppbnNlcnRCZWZvcmUoaXRlcmF0b3IgaXQsIGNvbnN0IFZhbHVlVHlwZSYgbmV3VmFs dWUpCithdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6aW5zZXJ0QmVmb3Jl KGl0ZXJhdG9yIGl0LCBjb25zdCBWYWx1ZVR5cGUmIG5ld1ZhbHVlKSAtPiBBZGRSZXN1bHQKIHsK LSAgICB0eXBlbmFtZSBJbXBsVHlwZTo6QWRkUmVzdWx0IHJlc3VsdCA9IG1faW1wbC50ZW1wbGF0 ZSBhZGQ8QmFzZVRyYW5zbGF0b3I+KG5ld1ZhbHVlLCBtX2FsbG9jYXRvci5nZXQoKSk7CisgICAg YXV0byByZXN1bHQgPSBtX2ltcGwudGVtcGxhdGUgYWRkPEJhc2VUcmFuc2xhdG9yPihuZXdWYWx1 ZSwgbV9hbGxvY2F0b3IuZ2V0KCkpOwogICAgIGlmIChyZXN1bHQuaXNOZXdFbnRyeSkKICAgICAg ICAgaW5zZXJ0Tm9kZUJlZm9yZShpdC5ub2RlKCksICpyZXN1bHQuaXRlcmF0b3IpOwogICAgIHJl dHVybiBBZGRSZXN1bHQobWFrZUl0ZXJhdG9yKCpyZXN1bHQuaXRlcmF0b3IpLCByZXN1bHQuaXNO ZXdFbnRyeSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0 eSwgdHlwZW5hbWUgVT4KLXR5cGVuYW1lIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBV Pjo6QWRkUmVzdWx0IExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6aW5zZXJ0QmVm b3JlKGNvbnN0IFZhbHVlVHlwZSYgYmVmb3JlVmFsdWUsIGNvbnN0IFZhbHVlVHlwZSYgbmV3VmFs dWUpCithdXRvIExpc3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6aW5zZXJ0QmVmb3Jl KGNvbnN0IFZhbHVlVHlwZSYgYmVmb3JlVmFsdWUsIGNvbnN0IFZhbHVlVHlwZSYgbmV3VmFsdWUp IC0+IEFkZFJlc3VsdAogewogICAgIHJldHVybiBpbnNlcnRCZWZvcmUoZmluZChiZWZvcmVWYWx1 ZSksIG5ld1ZhbHVlKTsgCiB9CkBAIC03NTYsMjIgKzcyOSwyMSBAQCB2b2lkIExpc3RIYXNoU2V0 PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6ZGVsZXRlQWxsTm9kZXMoKQogfQogCiB0ZW1wbGF0ZTx0 eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIFU+Ci1pbmxpbmUgTGlz dEhhc2hTZXRJdGVyYXRvcjxULCBpbmxpbmVDYXBhY2l0eSwgVT4gTGlzdEhhc2hTZXQ8VCwgaW5s aW5lQ2FwYWNpdHksIFU+OjptYWtlSXRlcmF0b3IoTm9kZSogcG9zaXRpb24pIAoraW5saW5lIGF1 dG8gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+OjptYWtlSXRlcmF0b3IoTm9kZSog cG9zaXRpb24pIC0+IGl0ZXJhdG9yCiB7Ci0gICAgcmV0dXJuIExpc3RIYXNoU2V0SXRlcmF0b3I8 VCwgaW5saW5lQ2FwYWNpdHksIFU+KHRoaXMsIHBvc2l0aW9uKTsgCisgICAgcmV0dXJuIGl0ZXJh dG9yKHRoaXMsIHBvc2l0aW9uKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlu bGluZUNhcGFjaXR5LCB0eXBlbmFtZSBVPgotaW5saW5lIExpc3RIYXNoU2V0Q29uc3RJdGVyYXRv cjxULCBpbmxpbmVDYXBhY2l0eSwgVT4gTGlzdEhhc2hTZXQ8VCwgaW5saW5lQ2FwYWNpdHksIFU+ OjptYWtlQ29uc3RJdGVyYXRvcihOb2RlKiBwb3NpdGlvbikgY29uc3QKK2lubGluZSBhdXRvIExp c3RIYXNoU2V0PFQsIGlubGluZUNhcGFjaXR5LCBVPjo6bWFrZUNvbnN0SXRlcmF0b3IoTm9kZSog cG9zaXRpb24pIGNvbnN0IC0+IGNvbnN0X2l0ZXJhdG9yCiB7IAotICAgIHJldHVybiBMaXN0SGFz aFNldENvbnN0SXRlcmF0b3I8VCwgaW5saW5lQ2FwYWNpdHksIFU+KHRoaXMsIHBvc2l0aW9uKTsg CisgICAgcmV0dXJuIGNvbnN0X2l0ZXJhdG9yKHRoaXMsIHBvc2l0aW9uKTsKIH0KKwogdGVtcGxh dGU8Ym9vbCwgdHlwZW5hbWUgVmFsdWVUeXBlLCB0eXBlbmFtZSBIYXNoVGFibGVUeXBlPgogdm9p ZCBkZWxldGVBbGxWYWx1ZXMoSGFzaFRhYmxlVHlwZSYgY29sbGVjdGlvbikKIHsKLSAgICB0eXBl ZGVmIHR5cGVuYW1lIEhhc2hUYWJsZVR5cGU6OmNvbnN0X2l0ZXJhdG9yIGl0ZXJhdG9yOwotICAg IGl0ZXJhdG9yIGVuZCA9IGNvbGxlY3Rpb24uZW5kKCk7Ci0gICAgZm9yIChpdGVyYXRvciBpdCA9 IGNvbGxlY3Rpb24uYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0KQorICAgIGZvciAoYXV0byBpdCA9 IGNvbGxlY3Rpb24uYmVnaW4oKSwgZW5kID0gY29sbGVjdGlvbi5lbmQoKTsgaXQgIT0gZW5kOyAr K2l0KQogICAgICAgICBkZWxldGUgKCppdCktPm1fdmFsdWU7CiB9CiAK