122707 2013-10-12 17:00:08 -0700 Rename toParentMediaElement to parentMediaElement, since it's not a type cast 2013-10-12 18:16:39 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin aboxhall apinheiro cfleizach commit-queue dmazzoni eflews.bot eric.carlson esprehn+autocc glenn gyuyoung.kim jdiggs jer.noble kondapallykalyan mario philn xan.lopez oldest_to_newest 939144 0 darin 2013-10-12 17:00:08 -0700 Rename toParentMediaElement to parentMediaElement, since it's not a type cast 939149 1 214071 darin 2013-10-12 17:14:27 -0700 Created attachment 214071 Patch 939151 2 214071 eflews.bot 2013-10-12 17:18:15 -0700 Comment on attachment 214071 Patch Attachment 214071 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/3931097 939152 3 214071 eflews.bot 2013-10-12 17:19:07 -0700 Comment on attachment 214071 Patch Attachment 214071 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/3339163 939153 4 214073 darin 2013-10-12 17:22:46 -0700 Created attachment 214073 Patch 939163 5 214073 commit-queue 2013-10-12 18:16:36 -0700 Comment on attachment 214073 Patch Clearing flags on attachment: 214073 Committed r157350: <http://trac.webkit.org/changeset/157350> 939164 6 commit-queue 2013-10-12 18:16:39 -0700 All reviewed patches have been landed. Closing bug. 214071 2013-10-12 17:14:27 -0700 2013-10-12 17:22:43 -0700 Patch bug-122707-20131012171427.patch text/plain 10691 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTVkMDFjYmI5ZDEzNjdj ZjlhZjE5OTYwMTA1NTI1NzJhN2NlNmUxOS4uMTAxM2U2YTgxOTMyNmVlMjQ2MjJkMjgzODk3YzY5 MDEyY2ZlYTNjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTEwLTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgdG9QYXJlbnRNZWRp YUVsZW1lbnQgdG8gcGFyZW50TWVkaWFFbGVtZW50LCBzaW5jZSBpdCdzIG5vdCBhIHR5cGUgY2Fz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyNzA3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzQ29udGFpbmVyOjpjb250cm9sbGluZ1ZpZGVv RWxlbWVudCk6IENhbGwgdGhlCisgICAgICAgIGZ1bmN0aW9uIGJ5IGl0cyBuZXcgbmFtZSwgYW5k IGFsc28gcmVtb3ZlIHVubmVjZXNzYXJ5IHR5cGUgY2FzdGluZy4KKworICAgICAgICAqIGh0bWwv c2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpw YXJlbnRNZWRpYUVsZW1lbnQpOiBSZW5hbWVkIGZyb20gdG9QYXJlbnRNZWRpYUVsZW1lbnQuIENo YW5nZWQgdG8gdXNlCisgICAgICAgIG51bGxwdHIuIFJlbW92ZWQgYW4gdW5uZWNlc3NhcnkgbnVs bCBjaGVjay4KKworICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBl cy5oOiBSZW5hbWVkIGZyb20gdG9QYXJlbnRNZWRpYUVsZW1lbnQuCisgICAgICAgIENoYW5nZWQg dGhlIGFyZ3VtZW50IHRvIHRoZSBSZW5kZXJPYmplY3Qgb3ZlcmxvYWQgdG8gYmUgYSByZWZlcmVu Y2UgcmF0aGVyIHRoYW4KKyAgICAgICAgYSBwb2ludGVyIHNpbmNlIGl0IGRvZXNuJ3QgaGFuZGxl IG51bGwuCisKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xDbG9zZWRDYXB0aW9uc1RyYWNrTGlzdEVs ZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250 cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50Ojp1cGRhdGVEaXNwbGF5KToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zVHJhY2tMaXN0RWxlbWVudDo6 cmVidWlsZFRyYWNrTGlzdE1lbnUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sRnVs bHNjcmVlbkJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRlRGlzcGxh eSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVt ZW50Ojp1cGRhdGVUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRl eHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OmNsZWFyVGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlU2l6ZXMpOgorICAgICAgICBVcGRhdGVkIHRvIHVzZSB0aGUgbmV3IG5hbWUuIEFsc28g dXNlIG51bGxwdHIuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNZWRpYUNvbnRyb2xzOjpwYWludE1lZGlhQ29u dHJvbHNQYXJ0KToKKyAgICAgICAgQ2FsbCB0aGUgZnVuY3Rpb24gYnkgaXRzIG5ldyBuYW1lIGFu ZCB3aXRoIGEgcmVmZXJlbmNlIGluc3RlYWQgb2YgYSBwb2ludGVyLgorCiAyMDEzLTEwLTEyICBB bnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBNb3ZlIHBvc2l0aW9u Rm9yUG9pbnQgdG8gUmVuZGVyVGV4dExpbmVCb3hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9scy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNwcAppbmRl eCAzYTQ2NGFlMGFkNThiYTg0YTFmMTVkZjczMDcwYWE5MmU2MDNkMmY2Li5mZjVjNGFlOGZlZTJh ODUyOTgyZjQ2MTkzMWZkYzU5YzAwZGJkMzhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNwcApAQCAt MjM4LDEyICsyMzgsOCBAQCBTdHJpbmcgQWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbHNDb250YWlu ZXI6OmhlbHBUZXh0KCkgY29uc3QKIAogYm9vbCBBY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9sc0Nv bnRhaW5lcjo6Y29udHJvbGxpbmdWaWRlb0VsZW1lbnQoKSBjb25zdAogewotICAgIGlmICghbV9y ZW5kZXJlci0+bm9kZSgpKQotICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgIE1lZGlhQ29udHJv bFRpbWVEaXNwbGF5RWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0PE1lZGlhQ29udHJvbFRp bWVEaXNwbGF5RWxlbWVudCo+KG1fcmVuZGVyZXItPm5vZGUoKSk7Ci0KLSAgICByZXR1cm4gdG9Q YXJlbnRNZWRpYUVsZW1lbnQoZWxlbWVudCktPmlzVmlkZW8oKTsKKyAgICBhdXRvIGVsZW1lbnQg PSBwYXJlbnRNZWRpYUVsZW1lbnQoKm1fcmVuZGVyZXIpOworICAgIHJldHVybiAhZWxlbWVudCB8 fCBlbGVtZW50LT5pc1ZpZGVvKCk7CiB9CiAKIGNvbnN0IFN0cmluZyBBY2Nlc3NpYmlsaXR5TWVk aWFDb250cm9sc0NvbnRhaW5lcjo6ZWxlbWVudFR5cGVOYW1lKCkgY29uc3QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50VHlwZXMuY3Bw CmluZGV4IDY2OTM4ZjljYzA4MzY2ODQ5N2RkZTI0MjIwYzA4YTlmZGRmOTE3YWQuLmM3ZTQ4YWFj MjA4MDJhNDc1MmRkMWZmYTAwYmExN2M5NWQzZGI0MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmNwcApAQCAtNTIs MTYgKzUyLDE1IEBAIHN0YXRpYyBjb25zdCBkb3VibGUgY1NraXBUaW1lID0gMC4yOwogc3RhdGlj IGNvbnN0IGRvdWJsZSBjU2NhblJlcGVhdERlbGF5ID0gMS41Owogc3RhdGljIGNvbnN0IGRvdWJs ZSBjU2Nhbk1heGltdW1SYXRlID0gODsKIAotSFRNTE1lZGlhRWxlbWVudCogdG9QYXJlbnRNZWRp YUVsZW1lbnQoTm9kZSogbm9kZSkKK0hUTUxNZWRpYUVsZW1lbnQqIHBhcmVudE1lZGlhRWxlbWVu dChOb2RlKiBub2RlKQogewogICAgIGlmICghbm9kZSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIE5vZGUqIG1lZGlhTm9kZSA9IG5vZGUtPnNoYWRvd0hv c3QoKTsKICAgICBpZiAoIW1lZGlhTm9kZSkKICAgICAgICAgbWVkaWFOb2RlID0gbm9kZTsKLSAg ICBpZiAoIW1lZGlhTm9kZSB8fCAhbWVkaWFOb2RlLT5pc0VsZW1lbnROb2RlKCkgfHwgIXRvRWxl bWVudChtZWRpYU5vZGUpLT5pc01lZGlhRWxlbWVudCgpKQotICAgICAgICByZXR1cm4gMDsKLQor ICAgIGlmICghbWVkaWFOb2RlLT5pc0VsZW1lbnROb2RlKCkgfHwgIXRvRWxlbWVudChtZWRpYU5v ZGUpLT5pc01lZGlhRWxlbWVudCgpKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICByZXR1 cm4gdG9IVE1MTWVkaWFFbGVtZW50KG1lZGlhTm9kZSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oIGIvU291cmNl L1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmgKaW5kZXggN2M3 ODZmODYwMDc2OGMzMDZmMGI1OTQxN2YwOGI3OGQwMjAxZjBmNi4uOWI0YjVmODY4NjgyZTg1OTQ2 OWRkNDRlYzYwYWQ1NjFlNzE5OGRmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmgKQEAgLTc0LDggKzc0LDggQEAgZW51 bSBNZWRpYUNvbnRyb2xFbGVtZW50VHlwZSB7CiAgICAgTWVkaWFDbG9zZWRDYXB0aW9uc1RyYWNr TGlzdCwKIH07CiAKLUhUTUxNZWRpYUVsZW1lbnQqIHRvUGFyZW50TWVkaWFFbGVtZW50KE5vZGUq KTsKLWlubGluZSBIVE1MTWVkaWFFbGVtZW50KiB0b1BhcmVudE1lZGlhRWxlbWVudChSZW5kZXJP YmplY3QqIHJlbmRlcmVyKSB7IHJldHVybiB0b1BhcmVudE1lZGlhRWxlbWVudChyZW5kZXJlci0+ bm9kZSgpKTsgfQorSFRNTE1lZGlhRWxlbWVudCogcGFyZW50TWVkaWFFbGVtZW50KE5vZGUqKTsK K2lubGluZSBIVE1MTWVkaWFFbGVtZW50KiBwYXJlbnRNZWRpYUVsZW1lbnQoUmVuZGVyT2JqZWN0 JiByZW5kZXJlcikgeyByZXR1cm4gcGFyZW50TWVkaWFFbGVtZW50KHJlbmRlcmVyLm5vZGUoKSk7 IH0KIAogTWVkaWFDb250cm9sRWxlbWVudFR5cGUgbWVkaWFDb250cm9sRWxlbWVudFR5cGUoTm9k ZSopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xFbGVtZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xF bGVtZW50cy5jcHAKaW5kZXggYzRjYjU5Y2JiNGMxZGEzYmZiYjVkOGNlYzEyN2ExODcyNGM4YzEw OS4uYWQ3ZDQ1YzEzZDViZTZmM2I1NmJmMjk5MjQ1OTZlZGY1MTE3Njg3NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudHMuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcApAQCAt Nzg5LDcgKzc4OSw3IEBAIHZvaWQgTWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RF bGVtZW50OjpkZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVuCiAgICAgICAgIGlmICghdGV4 dFRyYWNrKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIEhUTUxNZWRpYUVsZW1lbnQq IG1lZGlhRWxlbWVudCA9IHRvUGFyZW50TWVkaWFFbGVtZW50KHRoaXMpOworICAgICAgICBIVE1M TWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJlbnRNZWRpYUVsZW1lbnQodGhpcyk7CiAg ICAgICAgIGlmICghbWVkaWFFbGVtZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC04MjAs NyArODIwLDcgQEAgdm9pZCBNZWRpYUNvbnRyb2xDbG9zZWRDYXB0aW9uc1RyYWNrTGlzdEVsZW1l bnQ6OnVwZGF0ZURpc3BsYXkoKQogICAgICAgICByZXR1cm47CiAgICAgQ2FwdGlvblVzZXJQcmVm ZXJlbmNlczo6Q2FwdGlvbkRpc3BsYXlNb2RlIGRpc3BsYXlNb2RlID0gZG9jdW1lbnQoKS5wYWdl KCktPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCktPmNhcHRpb25EaXNwbGF5TW9kZSgpOwog Ci0gICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gdG9QYXJlbnRNZWRpYUVsZW1l bnQodGhpcyk7CisgICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVk aWFFbGVtZW50KHRoaXMpOwogICAgIGlmICghbWVkaWFFbGVtZW50KQogICAgICAgICByZXR1cm47 CiAKQEAgLTg4NCw3ICs4ODQsNyBAQCB2b2lkIE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zVHJh Y2tMaXN0RWxlbWVudDo6cmVidWlsZFRyYWNrTGlzdE1lbnUoKQogICAgIGlmICghbWVkaWFDb250 cm9sbGVyKCktPmhhc0Nsb3NlZENhcHRpb25zKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEhU TUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHRvUGFyZW50TWVkaWFFbGVtZW50KHRoaXMp OworICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHBhcmVudE1lZGlhRWxlbWVu dCh0aGlzKTsKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAgICAgcmV0dXJuOwogCkBAIC0x MDYwLDEwICsxMDYwLDEwIEBAIHZvaWQgTWVkaWFDb250cm9sRnVsbHNjcmVlbkJ1dHRvbkVsZW1l bnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogICAgICAgICAvLyB2aWRlbyBp bXBsZW1lbnRhdGlvbiB3aXRob3V0IHJlcXVpcmluZyB0aGVtIHRvIGltcGxlbWVudCB0aGVpciBv d24gZnVsbAogICAgICAgICAvLyBzY3JlZW4gYmVoYXZpb3IuCiAgICAgICAgIGlmIChkb2N1bWVu dCgpLnNldHRpbmdzKCkgJiYgZG9jdW1lbnQoKS5zZXR0aW5ncygpLT5mdWxsU2NyZWVuRW5hYmxl ZCgpKSB7Ci0gICAgICAgICAgICBpZiAoZG9jdW1lbnQoKS53ZWJraXRJc0Z1bGxTY3JlZW4oKSAm JiBkb2N1bWVudCgpLndlYmtpdEN1cnJlbnRGdWxsU2NyZWVuRWxlbWVudCgpID09IHRvUGFyZW50 TWVkaWFFbGVtZW50KHRoaXMpKQorICAgICAgICAgICAgaWYgKGRvY3VtZW50KCkud2Via2l0SXNG dWxsU2NyZWVuKCkgJiYgZG9jdW1lbnQoKS53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQo KSA9PSBwYXJlbnRNZWRpYUVsZW1lbnQodGhpcykpCiAgICAgICAgICAgICAgICAgZG9jdW1lbnQo KS53ZWJraXRDYW5jZWxGdWxsU2NyZWVuKCk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAg ICAgICAgZG9jdW1lbnQoKS5yZXF1ZXN0RnVsbFNjcmVlbkZvckVsZW1lbnQodG9QYXJlbnRNZWRp YUVsZW1lbnQodGhpcyksIDAsIERvY3VtZW50OjpFeGVtcHRJRnJhbWVBbGxvd0Z1bGxTY3JlZW5S ZXF1aXJlbWVudCk7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQoKS5yZXF1ZXN0RnVsbFNjcmVl bkZvckVsZW1lbnQocGFyZW50TWVkaWFFbGVtZW50KHRoaXMpLCAwLCBEb2N1bWVudDo6RXhlbXB0 SUZyYW1lQWxsb3dGdWxsU2NyZWVuUmVxdWlyZW1lbnQpOwogICAgICAgICB9IGVsc2UKICNlbmRp ZgogICAgICAgICAgICAgbWVkaWFDb250cm9sbGVyKCktPmVudGVyRnVsbHNjcmVlbigpOwpAQCAt MTIzMSw3ICsxMjMxLDcgQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVt ZW50Ojp1cGRhdGVEaXNwbGF5KCkKICAgICBpZiAoIW1lZGlhQ29udHJvbGxlcigpLT5jbG9zZWRD YXB0aW9uc1Zpc2libGUoKSkKICAgICAgICAgcmVtb3ZlQ2hpbGRyZW4oKTsKIAotICAgIEhUTUxN ZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHRvUGFyZW50TWVkaWFFbGVtZW50KHRoaXMpOwor ICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHBhcmVudE1lZGlhRWxlbWVudCh0 aGlzKTsKICAgICAvLyAxLiBJZiB0aGUgbWVkaWEgZWxlbWVudCBpcyBhbiBhdWRpbyBlbGVtZW50 LCBvciBpcyBhbm90aGVyIHBsYXliYWNrCiAgICAgLy8gbWVjaGFuaXNtIHdpdGggbm8gcmVuZGVy aW5nIGFyZWEsIGFib3J0IHRoZXNlIHN0ZXBzLiBUaGVyZSBpcyBub3RoaW5nIHRvCiAgICAgLy8g cmVuZGVyLgpAQCAtMTMyMiw3ICsxMzIyLDcgQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tD b250YWluZXJFbGVtZW50Ojp1cGRhdGVUaW1lckZpcmVkKFRpbWVyPE1lZGlhQ29udHJvbFQKICAg ICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0eUhlaWdodCwgbV92aWRlb0Rp c3BsYXlTaXplLnNpemUoKS5oZWlnaHQoKSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QWCk7CiAg ICAgfQogICAgIAotICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHRvUGFyZW50 TWVkaWFFbGVtZW50KHRoaXMpOworICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9 IHBhcmVudE1lZGlhRWxlbWVudCh0aGlzKTsKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAg ICAgcmV0dXJuOwogCkBAIC0xMzQwLDggKzEzNDAsOCBAQCB2b2lkIE1lZGlhQ29udHJvbFRleHRU cmFja0NvbnRhaW5lckVsZW1lbnQ6OnVwZGF0ZVRpbWVyRmlyZWQoVGltZXI8TWVkaWFDb250cm9s VAogCiB2b2lkIE1lZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OmNsZWFyVGV4 dFRyYWNrUmVwcmVzZW50YXRpb24oKQogewotICAgIGlmIChIVE1MTWVkaWFFbGVtZW50KiBtZWRp YUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudCh0aGlzKSkKLSAgICAgICAgbWVkaWFFbGVt ZW50LT5zZXRUZXh0VHJhY2tSZXByZXNlbnRhdGlvbigwKTsKKyAgICBpZiAoSFRNTE1lZGlhRWxl bWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KHRoaXMpKQorICAgICAgICBt ZWRpYUVsZW1lbnQtPnNldFRleHRUcmFja1JlcHJlc2VudGF0aW9uKG51bGxwdHIpOwogICAgIG1f dGV4dFRyYWNrUmVwcmVzZW50YXRpb24gPSBudWxscHRyOwogICAgIHJlbW92ZUlubGluZVN0eWxl UHJvcGVydHkoQ1NTUHJvcGVydHlQb3NpdGlvbik7CiAgICAgcmVtb3ZlSW5saW5lU3R5bGVQcm9w ZXJ0eShDU1NQcm9wZXJ0eVdpZHRoKTsKQEAgLTEzNjMsNyArMTM2Myw3IEBAIHZvaWQgTWVkaWFD b250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6ZXhpdGVkRnVsbHNjcmVlbigpCiAKIHZv aWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRlU2l6ZXMoYm9v bCBmb3JjZVVwZGF0ZSkKIHsKLSAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0 b1BhcmVudE1lZGlhRWxlbWVudCh0aGlzKTsKKyAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVs ZW1lbnQgPSBwYXJlbnRNZWRpYUVsZW1lbnQodGhpcyk7CiAgICAgaWYgKCFtZWRpYUVsZW1lbnQp CiAgICAgICAgIHJldHVybjsKIApAQCAtMTQyNCw3ICsxNDI0LDcgQEAgUGFzc1JlZlB0cjxJbWFn ZT4gTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6Y3JlYXRlVGV4dFRyYWNr UmVwcmVzZW4KICAgICBpZiAoIWJ1ZmZlcikKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAg ICBsYXllci0+cGFpbnQoYnVmZmVyLT5jb250ZXh0KCksIHBhaW50aW5nUmVjdCwgUGFpbnRCZWhh dmlvckZsYXR0ZW5Db21wb3NpdGluZ0xheWVycywgMCwgMCwgUmVuZGVyTGF5ZXI6OlBhaW50TGF5 ZXJQYWludGluZ0NvbXBvc2l0aW5nQWxsUGhhc2VzKTsKKyAgICBsYXllci0+cGFpbnQoYnVmZmVy LT5jb250ZXh0KCksIHBhaW50aW5nUmVjdCwgUGFpbnRCZWhhdmlvckZsYXR0ZW5Db21wb3NpdGlu Z0xheWVycywgbnVsbHB0ciwgbnVsbHB0ciwgUmVuZGVyTGF5ZXI6OlBhaW50TGF5ZXJQYWludGlu Z0NvbXBvc2l0aW5nQWxsUGhhc2VzKTsKIAogICAgIHJldHVybiBidWZmZXItPmNvcHlJbWFnZSgp OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29u dHJvbHMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMu Y3BwCmluZGV4IDQyOTAwMzk4YTA4ZTc1NzM1MTUxNjY3OGRjYTA4NWFiOWE1MDFmMzQuLjdlYTcz ZjNlMDc3NDZhYTM1NjA1NGM5MjU5MDBlNjBlYzNlNTFiMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9scy5jcHAKQEAgLTE3Myw3ICsxNzMsNyBA QCBib29sIFJlbmRlck1lZGlhQ29udHJvbHM6OnBhaW50TWVkaWFDb250cm9sc1BhcnQoTWVkaWFD b250cm9sRWxlbWVudFR5cGUgcGFydCwgUgogICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01l ZGlhVUlQYXJ0U2Vla0ZvcndhcmRCdXR0b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNv bnRleHQoKSwgciwgZGV0ZXJtaW5lU3RhdGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNl IE1lZGlhU2xpZGVyOiB7Ci0gICAgICAgIGlmIChIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1l bnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudChvKSkgeworICAgICAgICBpZiAoSFRNTE1lZGlhRWxl bWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KCpvKSkgewogICAgICAgICAg ICAgRmxvYXRSZWN0IHVuem9vbWVkUmVjdCA9IGdldFVuem9vbWVkUmVjdEFuZEFkanVzdEN1cnJl bnRDb250ZXh0KG8sIHBhaW50SW5mbywgcik7CiAgICAgICAgICAgICB3a0RyYXdNZWRpYVNsaWRl clRyYWNrKHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgdW56b29tZWRSZWN0 LCBtZWRpYUVsZW1lbnQtPnBlcmNlbnRMb2FkZWQoKSAqIG1lZGlhRWxlbWVudC0+ZHVyYXRpb24o KSwgbWVkaWFFbGVtZW50LT5jdXJyZW50VGltZSgpLCBtZWRpYUVsZW1lbnQtPmR1cmF0aW9uKCks IGRldGVybWluZVN0YXRlKG8pKTsKICAgICAgICAgfQo= 214073 2013-10-12 17:22:46 -0700 2013-10-12 18:16:36 -0700 Patch bug-122707-20131012172246.patch text/plain 19229 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTVkMDFjYmI5ZDEzNjdj ZjlhZjE5OTYwMTA1NTI1NzJhN2NlNmUxOS4uMWFlMDY5MmNmYmEwYzBiZDg4NWUwNzZlM2U1MGJi YWRmMmYxYjQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDEzLTEwLTEyICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgdG9QYXJlbnRNZWRp YUVsZW1lbnQgdG8gcGFyZW50TWVkaWFFbGVtZW50LCBzaW5jZSBpdCdzIG5vdCBhIHR5cGUgY2Fz dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyNzA3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzQ29udGFpbmVyOjpjb250cm9sbGluZ1ZpZGVv RWxlbWVudCk6IENhbGwgdGhlCisgICAgICAgIGZ1bmN0aW9uIGJ5IGl0cyBuZXcgbmFtZSwgYW5k IGFsc28gcmVtb3ZlIHVubmVjZXNzYXJ5IHR5cGUgY2FzdGluZy4KKworICAgICAgICAqIGh0bWwv c2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpw YXJlbnRNZWRpYUVsZW1lbnQpOiBSZW5hbWVkIGZyb20gdG9QYXJlbnRNZWRpYUVsZW1lbnQuIENo YW5nZWQgdG8gdXNlCisgICAgICAgIG51bGxwdHIuIFJlbW92ZWQgYW4gdW5uZWNlc3NhcnkgbnVs bCBjaGVjay4KKworICAgICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBl cy5oOiBSZW5hbWVkIGZyb20gdG9QYXJlbnRNZWRpYUVsZW1lbnQuCisgICAgICAgIENoYW5nZWQg dGhlIGFyZ3VtZW50IHRvIHRoZSBSZW5kZXJPYmplY3Qgb3ZlcmxvYWQgdG8gYmUgYSByZWZlcmVu Y2UgcmF0aGVyIHRoYW4KKyAgICAgICAgYSBwb2ludGVyIHNpbmNlIGl0IGRvZXNuJ3QgaGFuZGxl IG51bGwuCisKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xDbG9zZWRDYXB0aW9uc1RyYWNrTGlzdEVs ZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250 cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50Ojp1cGRhdGVEaXNwbGF5KToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zVHJhY2tMaXN0RWxlbWVudDo6 cmVidWlsZFRyYWNrTGlzdE1lbnUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sRnVs bHNjcmVlbkJ1dHRvbkVsZW1lbnQ6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6dXBkYXRlRGlzcGxh eSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVt ZW50Ojp1cGRhdGVUaW1lckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbFRl eHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OmNsZWFyVGV4dFRyYWNrUmVwcmVzZW50YXRpb24pOgor ICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlU2l6ZXMpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFDb250cm9sVGV4dFRyYWNrQ29u dGFpbmVyRWxlbWVudDo6Y3JlYXRlVGV4dFRyYWNrUmVwcmVzZW50YXRpb25JbWFnZSk6CisgICAg ICAgIFVwZGF0ZWQgdG8gdXNlIHRoZSBuZXcgbmFtZS4gQWxzbyB1c2UgbnVsbHB0ci4KKworICAg ICAgICAqIGh0bWwvc2hhZG93L01lZGlhQ29udHJvbHNCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhQ29udHJvbEZ1bGxzY3JlZW5GdWxsc2NyZWVuQnV0dG9uRWxlbWVudDo6 ZGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAgIFVwZGF0ZWQgdG8gdXNlIHRoZSBuZXcgbmFt ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRldGVybWluZUZ1bGxTY3JlZW5NdWx0aXBsaWVyKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6YWRqdXN0TWVkaWFDb250 cm9sU3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWlu dE1lZGlhUGxheUJ1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUJsYWNrQmVy cnk6OnBhaW50TWVkaWFSZXdpbmRCdXR0b24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVCbGFja0JlcnJ5OjpwYWludE1lZGlhTXV0ZUJ1dHRvbik6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFGdWxsc2NyZWVuQnV0dG9uKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVNsaWRlclRyYWNr KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVZv bHVtZVNsaWRlclRyYWNrKToKKyAgICAgICAgVXBkYXRlZCB0byB1c2UgdGhlIG5ldyBuYW1lLgor CisgICAgICAgICogcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlclRoZW1lRWZsOjpwYWludE1lZGlhU2xpZGVyVHJhY2spOgorICAgICAgICBV cGRhdGVkIHRvIHVzZSB0aGUgbmV3IG5hbWUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVHdGs6OnBhaW50 TWVkaWFTbGlkZXJUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUd0azo6cGFp bnRNZWRpYVZvbHVtZVNsaWRlclRyYWNrKToKKyAgICAgICAgVXBkYXRlZCB0byB1c2UgdGhlIG5l dyBuYW1lLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTWVkaWFDb250cm9sczo6cGFpbnRNZWRpYUNvbnRyb2xz UGFydCk6CisgICAgICAgIENhbGwgdGhlIGZ1bmN0aW9uIGJ5IGl0cyBuZXcgbmFtZSBhbmQgd2l0 aCBhIHJlZmVyZW5jZSBpbnN0ZWFkIG9mIGEgcG9pbnRlci4KKwogMjAxMy0xMC0xMiAgQW50dGkg S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTW92ZSBwb3NpdGlvbkZvclBv aW50IHRvIFJlbmRlclRleHRMaW5lQm94ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbHMuY3BwIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9scy5jcHAKaW5kZXggM2E0 NjRhZTBhZDU4YmE4NGExZjE1ZGY3MzA3MGFhOTJlNjAzZDJmNi4uZmY1YzRhZThmZWUyYTg1Mjk4 MmY0NjE5MzFmZGM1OWMwMGRiZDM4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9scy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5TWVkaWFDb250cm9scy5jcHAKQEAgLTIzOCwx MiArMjM4LDggQEAgU3RyaW5nIEFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzQ29udGFpbmVyOjpo ZWxwVGV4dCgpIGNvbnN0CiAKIGJvb2wgQWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbHNDb250YWlu ZXI6OmNvbnRyb2xsaW5nVmlkZW9FbGVtZW50KCkgY29uc3QKIHsKLSAgICBpZiAoIW1fcmVuZGVy ZXItPm5vZGUoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICBNZWRpYUNvbnRyb2xUaW1l RGlzcGxheUVsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxNZWRpYUNvbnRyb2xUaW1lRGlz cGxheUVsZW1lbnQqPihtX3JlbmRlcmVyLT5ub2RlKCkpOwotCi0gICAgcmV0dXJuIHRvUGFyZW50 TWVkaWFFbGVtZW50KGVsZW1lbnQpLT5pc1ZpZGVvKCk7CisgICAgYXV0byBlbGVtZW50ID0gcGFy ZW50TWVkaWFFbGVtZW50KCptX3JlbmRlcmVyKTsKKyAgICByZXR1cm4gIWVsZW1lbnQgfHwgZWxl bWVudC0+aXNWaWRlbygpOwogfQogCiBjb25zdCBTdHJpbmcgQWNjZXNzaWJpbGl0eU1lZGlhQ29u dHJvbHNDb250YWluZXI6OmVsZW1lbnRUeXBlTmFtZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50VHlwZXMuY3BwIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVudFR5cGVzLmNwcAppbmRl eCA2NjkzOGY5Y2MwODM2Njg0OTdkZGUyNDIyMGMwOGE5ZmRkZjkxN2FkLi5jN2U0OGFhYzIwODAy YTQ3NTJkZDFmZmEwMGJhMTdjOTVkM2RiNDAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50VHlwZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5jcHAKQEAgLTUyLDE2ICs1 MiwxNSBAQCBzdGF0aWMgY29uc3QgZG91YmxlIGNTa2lwVGltZSA9IDAuMjsKIHN0YXRpYyBjb25z dCBkb3VibGUgY1NjYW5SZXBlYXREZWxheSA9IDEuNTsKIHN0YXRpYyBjb25zdCBkb3VibGUgY1Nj YW5NYXhpbXVtUmF0ZSA9IDg7CiAKLUhUTUxNZWRpYUVsZW1lbnQqIHRvUGFyZW50TWVkaWFFbGVt ZW50KE5vZGUqIG5vZGUpCitIVE1MTWVkaWFFbGVtZW50KiBwYXJlbnRNZWRpYUVsZW1lbnQoTm9k ZSogbm9kZSkKIHsKICAgICBpZiAoIW5vZGUpCi0gICAgICAgIHJldHVybiAwOworICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKICAgICBOb2RlKiBtZWRpYU5vZGUgPSBub2RlLT5zaGFkb3dIb3N0KCk7 CiAgICAgaWYgKCFtZWRpYU5vZGUpCiAgICAgICAgIG1lZGlhTm9kZSA9IG5vZGU7Ci0gICAgaWYg KCFtZWRpYU5vZGUgfHwgIW1lZGlhTm9kZS0+aXNFbGVtZW50Tm9kZSgpIHx8ICF0b0VsZW1lbnQo bWVkaWFOb2RlKS0+aXNNZWRpYUVsZW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KKyAgICBp ZiAoIW1lZGlhTm9kZS0+aXNFbGVtZW50Tm9kZSgpIHx8ICF0b0VsZW1lbnQobWVkaWFOb2RlKS0+ aXNNZWRpYUVsZW1lbnQoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgcmV0dXJuIHRv SFRNTE1lZGlhRWxlbWVudChtZWRpYU5vZGUpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50VHlwZXMuaCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oCmluZGV4IDdjNzg2Zjg2 MDA3NjhjMzA2ZjBiNTk0MTdmMDhiNzhkMDIwMWYwZjYuLjliNGI1Zjg2ODY4MmU4NTk0NjlkZDQ0 ZWM2MGFkNTYxZTcxOThkZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93 L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hh ZG93L01lZGlhQ29udHJvbEVsZW1lbnRUeXBlcy5oCkBAIC03NCw4ICs3NCw4IEBAIGVudW0gTWVk aWFDb250cm9sRWxlbWVudFR5cGUgewogICAgIE1lZGlhQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3Qs CiB9OwogCi1IVE1MTWVkaWFFbGVtZW50KiB0b1BhcmVudE1lZGlhRWxlbWVudChOb2RlKik7Ci1p bmxpbmUgSFRNTE1lZGlhRWxlbWVudCogdG9QYXJlbnRNZWRpYUVsZW1lbnQoUmVuZGVyT2JqZWN0 KiByZW5kZXJlcikgeyByZXR1cm4gdG9QYXJlbnRNZWRpYUVsZW1lbnQocmVuZGVyZXItPm5vZGUo KSk7IH0KK0hUTUxNZWRpYUVsZW1lbnQqIHBhcmVudE1lZGlhRWxlbWVudChOb2RlKik7Citpbmxp bmUgSFRNTE1lZGlhRWxlbWVudCogcGFyZW50TWVkaWFFbGVtZW50KFJlbmRlck9iamVjdCYgcmVu ZGVyZXIpIHsgcmV0dXJuIHBhcmVudE1lZGlhRWxlbWVudChyZW5kZXJlci5ub2RlKCkpOyB9CiAK IE1lZGlhQ29udHJvbEVsZW1lbnRUeXBlIG1lZGlhQ29udHJvbEVsZW1lbnRUeXBlKE5vZGUqKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxl bWVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sRWxlbWVu dHMuY3BwCmluZGV4IGM0Y2I1OWNiYjRjMWRhM2JmYmI1ZDhjZWMxMjdhMTg3MjRjOGMxMDkuLmFk N2Q0NWMxM2Q1YmU2ZjNiNTZiZjI5OTI0NTk2ZWRmNTExNzY4NzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xFbGVtZW50cy5jcHAKQEAgLTc4OSw3 ICs3ODksNyBAQCB2b2lkIE1lZGlhQ29udHJvbENsb3NlZENhcHRpb25zVHJhY2tMaXN0RWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbgogICAgICAgICBpZiAoIXRleHRUcmFj aykKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRp YUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudCh0aGlzKTsKKyAgICAgICAgSFRNTE1lZGlh RWxlbWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KHRoaXMpOwogICAgICAg ICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAgICAgICAgIHJldHVybjsKIApAQCAtODIwLDcgKzgy MCw3IEBAIHZvaWQgTWVkaWFDb250cm9sQ2xvc2VkQ2FwdGlvbnNUcmFja0xpc3RFbGVtZW50Ojp1 cGRhdGVEaXNwbGF5KCkKICAgICAgICAgcmV0dXJuOwogICAgIENhcHRpb25Vc2VyUHJlZmVyZW5j ZXM6OkNhcHRpb25EaXNwbGF5TW9kZSBkaXNwbGF5TW9kZSA9IGRvY3VtZW50KCkucGFnZSgpLT5n cm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLT5jYXB0aW9uRGlzcGxheU1vZGUoKTsKIAotICAg IEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHRvUGFyZW50TWVkaWFFbGVtZW50KHRo aXMpOworICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHBhcmVudE1lZGlhRWxl bWVudCh0aGlzKTsKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAgICAgcmV0dXJuOwogCkBA IC04ODQsNyArODg0LDcgQEAgdm9pZCBNZWRpYUNvbnRyb2xDbG9zZWRDYXB0aW9uc1RyYWNrTGlz dEVsZW1lbnQ6OnJlYnVpbGRUcmFja0xpc3RNZW51KCkKICAgICBpZiAoIW1lZGlhQ29udHJvbGxl cigpLT5oYXNDbG9zZWRDYXB0aW9ucygpKQogICAgICAgICByZXR1cm47CiAKLSAgICBIVE1MTWVk aWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudCh0aGlzKTsKKyAg ICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJlbnRNZWRpYUVsZW1lbnQodGhp cyk7CiAgICAgaWYgKCFtZWRpYUVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTA2MCwx MCArMTA2MCwxMCBAQCB2b2lkIE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5CdXR0b25FbGVtZW50Ojpk ZWZhdWx0RXZlbnRIYW5kbGVyKEV2ZW50KiBldmVudCkKICAgICAgICAgLy8gdmlkZW8gaW1wbGVt ZW50YXRpb24gd2l0aG91dCByZXF1aXJpbmcgdGhlbSB0byBpbXBsZW1lbnQgdGhlaXIgb3duIGZ1 bGwKICAgICAgICAgLy8gc2NyZWVuIGJlaGF2aW9yLgogICAgICAgICBpZiAoZG9jdW1lbnQoKS5z ZXR0aW5ncygpICYmIGRvY3VtZW50KCkuc2V0dGluZ3MoKS0+ZnVsbFNjcmVlbkVuYWJsZWQoKSkg ewotICAgICAgICAgICAgaWYgKGRvY3VtZW50KCkud2Via2l0SXNGdWxsU2NyZWVuKCkgJiYgZG9j dW1lbnQoKS53ZWJraXRDdXJyZW50RnVsbFNjcmVlbkVsZW1lbnQoKSA9PSB0b1BhcmVudE1lZGlh RWxlbWVudCh0aGlzKSkKKyAgICAgICAgICAgIGlmIChkb2N1bWVudCgpLndlYmtpdElzRnVsbFNj cmVlbigpICYmIGRvY3VtZW50KCkud2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50KCkgPT0g cGFyZW50TWVkaWFFbGVtZW50KHRoaXMpKQogICAgICAgICAgICAgICAgIGRvY3VtZW50KCkud2Vi a2l0Q2FuY2VsRnVsbFNjcmVlbigpOwogICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAg IGRvY3VtZW50KCkucmVxdWVzdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KHRvUGFyZW50TWVkaWFFbGVt ZW50KHRoaXMpLCAwLCBEb2N1bWVudDo6RXhlbXB0SUZyYW1lQWxsb3dGdWxsU2NyZWVuUmVxdWly ZW1lbnQpOworICAgICAgICAgICAgICAgIGRvY3VtZW50KCkucmVxdWVzdEZ1bGxTY3JlZW5Gb3JF bGVtZW50KHBhcmVudE1lZGlhRWxlbWVudCh0aGlzKSwgMCwgRG9jdW1lbnQ6OkV4ZW1wdElGcmFt ZUFsbG93RnVsbFNjcmVlblJlcXVpcmVtZW50KTsKICAgICAgICAgfSBlbHNlCiAjZW5kaWYKICAg ICAgICAgICAgIG1lZGlhQ29udHJvbGxlcigpLT5lbnRlckZ1bGxzY3JlZW4oKTsKQEAgLTEyMzEs NyArMTIzMSw3IEBAIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlRGlzcGxheSgpCiAgICAgaWYgKCFtZWRpYUNvbnRyb2xsZXIoKS0+Y2xvc2VkQ2FwdGlv bnNWaXNpYmxlKCkpCiAgICAgICAgIHJlbW92ZUNoaWxkcmVuKCk7CiAKLSAgICBIVE1MTWVkaWFF bGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudCh0aGlzKTsKKyAgICBI VE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJlbnRNZWRpYUVsZW1lbnQodGhpcyk7 CiAgICAgLy8gMS4gSWYgdGhlIG1lZGlhIGVsZW1lbnQgaXMgYW4gYXVkaW8gZWxlbWVudCwgb3Ig aXMgYW5vdGhlciBwbGF5YmFjawogICAgIC8vIG1lY2hhbmlzbSB3aXRoIG5vIHJlbmRlcmluZyBh cmVhLCBhYm9ydCB0aGVzZSBzdGVwcy4gVGhlcmUgaXMgbm90aGluZyB0bwogICAgIC8vIHJlbmRl ci4KQEAgLTEzMjIsNyArMTMyMiw3IEBAIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFp bmVyRWxlbWVudDo6dXBkYXRlVGltZXJGaXJlZChUaW1lcjxNZWRpYUNvbnRyb2xUCiAgICAgICAg IHNldElubGluZVN0eWxlUHJvcGVydHkoQ1NTUHJvcGVydHlIZWlnaHQsIG1fdmlkZW9EaXNwbGF5 U2l6ZS5zaXplKCkuaGVpZ2h0KCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpOwogICAgIH0K ICAgICAKLSAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlh RWxlbWVudCh0aGlzKTsKKyAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJl bnRNZWRpYUVsZW1lbnQodGhpcyk7CiAgICAgaWYgKCFtZWRpYUVsZW1lbnQpCiAgICAgICAgIHJl dHVybjsKIApAQCAtMTM0MCw4ICsxMzQwLDggQEAgdm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tD b250YWluZXJFbGVtZW50Ojp1cGRhdGVUaW1lckZpcmVkKFRpbWVyPE1lZGlhQ29udHJvbFQKIAog dm9pZCBNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50OjpjbGVhclRleHRUcmFj a1JlcHJlc2VudGF0aW9uKCkKIHsKLSAgICBpZiAoSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVt ZW50ID0gdG9QYXJlbnRNZWRpYUVsZW1lbnQodGhpcykpCi0gICAgICAgIG1lZGlhRWxlbWVudC0+ c2V0VGV4dFRyYWNrUmVwcmVzZW50YXRpb24oMCk7CisgICAgaWYgKEhUTUxNZWRpYUVsZW1lbnQq IG1lZGlhRWxlbWVudCA9IHBhcmVudE1lZGlhRWxlbWVudCh0aGlzKSkKKyAgICAgICAgbWVkaWFF bGVtZW50LT5zZXRUZXh0VHJhY2tSZXByZXNlbnRhdGlvbihudWxscHRyKTsKICAgICBtX3RleHRU cmFja1JlcHJlc2VudGF0aW9uID0gbnVsbHB0cjsKICAgICByZW1vdmVJbmxpbmVTdHlsZVByb3Bl cnR5KENTU1Byb3BlcnR5UG9zaXRpb24pOwogICAgIHJlbW92ZUlubGluZVN0eWxlUHJvcGVydHko Q1NTUHJvcGVydHlXaWR0aCk7CkBAIC0xMzYzLDcgKzEzNjMsNyBAQCB2b2lkIE1lZGlhQ29udHJv bFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OmV4aXRlZEZ1bGxzY3JlZW4oKQogCiB2b2lkIE1l ZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OnVwZGF0ZVNpemVzKGJvb2wgZm9y Y2VVcGRhdGUpCiB7Ci0gICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gdG9QYXJl bnRNZWRpYUVsZW1lbnQodGhpcyk7CisgICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50 ID0gcGFyZW50TWVkaWFFbGVtZW50KHRoaXMpOwogICAgIGlmICghbWVkaWFFbGVtZW50KQogICAg ICAgICByZXR1cm47CiAKQEAgLTE0MjQsNyArMTQyNCw3IEBAIFBhc3NSZWZQdHI8SW1hZ2U+IE1l ZGlhQ29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OmNyZWF0ZVRleHRUcmFja1JlcHJl c2VuCiAgICAgaWYgKCFidWZmZXIpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgbGF5 ZXItPnBhaW50KGJ1ZmZlci0+Y29udGV4dCgpLCBwYWludGluZ1JlY3QsIFBhaW50QmVoYXZpb3JG bGF0dGVuQ29tcG9zaXRpbmdMYXllcnMsIDAsIDAsIFJlbmRlckxheWVyOjpQYWludExheWVyUGFp bnRpbmdDb21wb3NpdGluZ0FsbFBoYXNlcyk7CisgICAgbGF5ZXItPnBhaW50KGJ1ZmZlci0+Y29u dGV4dCgpLCBwYWludGluZ1JlY3QsIFBhaW50QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXll cnMsIG51bGxwdHIsIG51bGxwdHIsIFJlbmRlckxheWVyOjpQYWludExheWVyUGFpbnRpbmdDb21w b3NpdGluZ0FsbFBoYXNlcyk7CiAKICAgICByZXR1cm4gYnVmZmVyLT5jb3B5SW1hZ2UoKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNCbGFj a0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNCbGFj a0JlcnJ5LmNwcAppbmRleCBhMTQyYmJmYjQ3OWM3NGIwZjRmYjY5NTNhOWQyM2U1OTY2MTkxMmFm Li5jMTA3ODYxNjFkNDZjMjE2NzE3YTFkMTM3YmRkZmIwODM1ODZmODExIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzQmxhY2tCZXJyeS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0JsYWNrQmVycnkuY3Bw CkBAIC00MjYsMTAgKzQyNiwxMCBAQCB2b2lkIE1lZGlhQ29udHJvbEZ1bGxzY3JlZW5GdWxsc2Ny ZWVuQnV0dG9uRWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZQogICAgICAgICAv LyB2aWRlbyBpbXBsZW1lbnRhdGlvbiB3aXRob3V0IHJlcXVpcmluZyB0aGVtIHRvIGltcGxlbWVu dCB0aGVpciBvd24gZnVsbCAKICAgICAgICAgLy8gc2NyZWVuIGJlaGF2aW9yLgogICAgICAgICBp ZiAoZG9jdW1lbnQoKS0+c2V0dGluZ3MoKSAmJiBkb2N1bWVudCgpLT5zZXR0aW5ncygpLT5mdWxs U2NyZWVuRW5hYmxlZCgpKSB7Ci0gICAgICAgICAgICBpZiAoZG9jdW1lbnQoKS0+d2Via2l0SXNG dWxsU2NyZWVuKCkgJiYgZG9jdW1lbnQoKS0+d2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50 KCkgPT0gdG9QYXJlbnRNZWRpYUVsZW1lbnQodGhpcykpCisgICAgICAgICAgICBpZiAoZG9jdW1l bnQoKS0+d2Via2l0SXNGdWxsU2NyZWVuKCkgJiYgZG9jdW1lbnQoKS0+d2Via2l0Q3VycmVudEZ1 bGxTY3JlZW5FbGVtZW50KCkgPT0gcGFyZW50TWVkaWFFbGVtZW50KHRoaXMpKQogICAgICAgICAg ICAgICAgIGRvY3VtZW50KCktPndlYmtpdENhbmNlbEZ1bGxTY3JlZW4oKTsKICAgICAgICAgICAg IGVsc2UKLSAgICAgICAgICAgICAgICBkb2N1bWVudCgpLT5yZXF1ZXN0RnVsbFNjcmVlbkZvckVs ZW1lbnQodG9QYXJlbnRNZWRpYUVsZW1lbnQodGhpcyksIDAsIERvY3VtZW50OjpFeGVtcHRJRnJh bWVBbGxvd0Z1bGxTY3JlZW5SZXF1aXJlbWVudCk7CisgICAgICAgICAgICAgICAgZG9jdW1lbnQo KS0+cmVxdWVzdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KHBhcmVudE1lZGlhRWxlbWVudCh0aGlzKSwg MCwgRG9jdW1lbnQ6OkV4ZW1wdElGcmFtZUFsbG93RnVsbFNjcmVlblJlcXVpcmVtZW50KTsKICAg ICAgICAgfSBlbHNlCiAjZW5kaWYKICAgICAgICAgICAgIG1lZGlhQ29udHJvbGxlcigpLT5lbnRl ckZ1bGxzY3JlZW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNr YmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFja0JlcnJ5LmNwcAppbmRleCAxZTFhNTk4YjEwMGJm OGQwYmYzNmMwNDU5ZDJjODBiNTMwMTVkNGQxLi5iY2E3OGFhOTMzNzNjODg5MjhmZTEzZTRlNzBl MTI3ZGQyMTY1N2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2Jl cnJ5L1JlbmRlclRoZW1lQmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3BwCkBAIC0xMDEsNyArMTAxLDcg QEAgc3RhdGljIGZsb2F0IGRldGVybWluZUZ1bGxTY3JlZW5NdWx0aXBsaWVyKEVsZW1lbnQqIGVs ZW1lbnQpCiB7CiAgICAgZmxvYXQgZnVsbFNjcmVlbk11bHRpcGxpZXIgPSAxLjA7CiAjaWYgRU5B QkxFKEZVTExTQ1JFRU5fQVBJKSAmJiBFTkFCTEUoVklERU8pCi0gICAgaWYgKGVsZW1lbnQgJiYg ZWxlbWVudC0+ZG9jdW1lbnQoKS0+d2Via2l0SXNGdWxsU2NyZWVuKCkgJiYgZWxlbWVudC0+ZG9j dW1lbnQoKS0+d2Via2l0Q3VycmVudEZ1bGxTY3JlZW5FbGVtZW50KCkgPT0gdG9QYXJlbnRNZWRp YUVsZW1lbnQoZWxlbWVudCkpIHsKKyAgICBpZiAoZWxlbWVudCAmJiBlbGVtZW50LT5kb2N1bWVu dCgpLT53ZWJraXRJc0Z1bGxTY3JlZW4oKSAmJiBlbGVtZW50LT5kb2N1bWVudCgpLT53ZWJraXRD dXJyZW50RnVsbFNjcmVlbkVsZW1lbnQoKSA9PSBwYXJlbnRNZWRpYUVsZW1lbnQoZWxlbWVudCkp IHsKICAgICAgICAgaWYgKFBhZ2UqIHBhZ2UgPSBlbGVtZW50LT5kb2N1bWVudCgpLT5wYWdlKCkp IHsKICAgICAgICAgICAgIGlmIChwYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpIDwgc2NhbGVGYWN0 b3JUaHJlc2hvbGQpCiAgICAgICAgICAgICAgICAgZnVsbFNjcmVlbk11bHRpcGxpZXIgPSBmdWxs U2NyZWVuRW5sYXJnZW1lbnRGYWN0b3I7CkBAIC03MzgsNyArNzM4LDcgQEAgYm9vbCBSZW5kZXJU aGVtZUJsYWNrQmVycnk6OnBhaW50U2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNv bnN0IFBhaW50SW4KIHZvaWQgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjphZGp1c3RNZWRpYUNvbnRy b2xTdHlsZShTdHlsZVJlc29sdmVyKiwgUmVuZGVyU3R5bGUqIHN0eWxlLCBFbGVtZW50KiBlbGVt ZW50KSBjb25zdAogewogICAgIGZsb2F0IGZ1bGxTY3JlZW5NdWx0aXBsaWVyID0gZGV0ZXJtaW5l RnVsbFNjcmVlbk11bHRpcGxpZXIoZWxlbWVudCk7Ci0gICAgSFRNTE1lZGlhRWxlbWVudCogbWVk aWFFbGVtZW50ID0gdG9QYXJlbnRNZWRpYUVsZW1lbnQoZWxlbWVudCk7CisgICAgSFRNTE1lZGlh RWxlbWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KGVsZW1lbnQpOwogICAg IGlmICghbWVkaWFFbGVtZW50KQogICAgICAgICByZXR1cm47CiAKQEAgLTgyMCw3ICs4MjAsNyBA QCBzdGF0aWMgYm9vbCBwYWludE1lZGlhQnV0dG9uKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwg Y29uc3QgSW50UmVjdCYgcmVjdCwgSW1hZwogYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBh aW50TWVkaWFQbGF5QnV0dG9uKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWludEluZm8m IHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICNpZiBFTkFCTEUoVklERU8pCi0g ICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gdG9QYXJlbnRNZWRpYUVsZW1lbnQo b2JqZWN0KTsKKyAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJlbnRNZWRp YUVsZW1lbnQoKm9iamVjdCk7CiAKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtODUwLDcgKzg1MCw3IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5 OjpwYWludE1lZGlhUGxheUJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFpCiBi b29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVJld2luZEJ1dHRvbihSZW5kZXJP YmplY3QqIG9iamVjdCwgY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3Qm IHJlY3QpCiB7CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlh RWxlbWVudCA9IHRvUGFyZW50TWVkaWFFbGVtZW50KG9iamVjdCk7CisgICAgSFRNTE1lZGlhRWxl bWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KCpvYmplY3QpOwogCiAgICAg aWYgKCFtZWRpYUVsZW1lbnQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTg3Miw3ICs4NzIs NyBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVJld2luZEJ1dHRvbihS ZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUAogYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6 OnBhaW50TWVkaWFNdXRlQnV0dG9uKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYWludElu Zm8mIHBhaW50SW5mbywgY29uc3QgSW50UmVjdCYgcmVjdCkKIHsKICNpZiBFTkFCTEUoVklERU8p Ci0gICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0gdG9QYXJlbnRNZWRpYUVsZW1l bnQob2JqZWN0KTsKKyAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSBwYXJlbnRN ZWRpYUVsZW1lbnQoKm9iamVjdCk7CiAKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAgICAg cmV0dXJuIGZhbHNlOwpAQCAtODkxLDcgKzg5MSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0Jl cnJ5OjpwYWludE1lZGlhTXV0ZUJ1dHRvbihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3QgUGFp CiBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYUZ1bGxzY3JlZW5CdXR0b24o UmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJ bnRSZWN0JiByZWN0KQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICBIVE1MTWVkaWFFbGVtZW50 KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudChvYmplY3QpOworICAgIEhUTUxN ZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHBhcmVudE1lZGlhRWxlbWVudCgqb2JqZWN0KTsK ICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCkBAIC05MjAs NyArOTIwLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFGdWxsc2Ny ZWVuQnV0dG9uKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb24KIGJvb2wgUmVuZGVyVGhlbWVCbGFj a0JlcnJ5OjpwYWludE1lZGlhU2xpZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0 IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBJbnRSZWN0JiByZWN0KQogewogI2lmIEVOQUJM RShWSURFTykKLSAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1l ZGlhRWxlbWVudChvYmplY3QpOworICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9 IHBhcmVudE1lZGlhRWxlbWVudCgqb2JqZWN0KTsKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAg ICAgICAgcmV0dXJuIGZhbHNlOwogCkBAIC05OTQsNyArOTk0LDcgQEAgYm9vbCBSZW5kZXJUaGVt ZUJsYWNrQmVycnk6OnBhaW50TWVkaWFTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG9iamVjdCwg Y29uc3QgUGEKIGJvb2wgUmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhVm9sdW1lU2xp ZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZv LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewogI2lmIEVOQUJMRShWSURFTykKLSAgICBIVE1MTWVk aWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVudE1lZGlhRWxlbWVudChvYmplY3QpOwor ICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHBhcmVudE1lZGlhRWxlbWVudCgq b2JqZWN0KTsKICAgICBpZiAoIW1lZGlhRWxlbWVudCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZWZsL1JlbmRlclRoZW1lRWZsLmNwcAppbmRl eCAzZDVlMTg3NmJlNmE3MGIxNDBiNTIwMDkzYTA3ZmQ3ODc3YjQ4Mjk5Li5kYjc4OGIzZjJmZDM0 NDI5NGI1ZjA4ZmY4MjdhMjQzM2FmMTk2NjQ2IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9lZmwvUmVuZGVyVGhlbWVFZmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2VmbC9SZW5kZXJUaGVtZUVmbC5jcHAKQEAgLTExOTQsNyArMTE5NCw3IEBAIGJvb2wgUmVu ZGVyVGhlbWVFZmw6OnBhaW50TWVkaWFTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG9iamVjdCwg Y29uc3QgUGFpbnRJbmZvCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cmVjdC53aWR0aCgpLCBtZWRpYVNsaWRlckhlaWdodCkpLCBtX21lZGlhU2xpZGVyQ29sb3IsIENv bG9yU3BhY2VEZXZpY2VSR0IpOwogCiAgICAgUmVuZGVyU3R5bGUqIHN0eWxlID0gb2JqZWN0LT5z dHlsZSgpOwotICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxlbWVudCA9IHRvUGFyZW50TWVk aWFFbGVtZW50KG9iamVjdCk7CisgICAgSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW50ID0g cGFyZW50TWVkaWFFbGVtZW50KCpvYmplY3QpOwogCiAgICAgaWYgKCFtZWRpYUVsZW1lbnQpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVu ZGVyVGhlbWVHdGsuY3BwCmluZGV4IDlmNzM0ZmQ5Zjg5MWE3N2FjYTg2ZGY1MTcxNzVhMzUzNzgw ZTk5ODYuLmM3MjJmYTY2MDk5MTFjZmMzYWI1ZTNlYTAwNzBjYjY3OTY4ZTdjNzIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZUd0ay5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lR3RrLmNwcApAQCAtNTU1LDcg KzU1NSw3IEBAIHN0YXRpYyBSb3VuZGVkUmVjdDo6UmFkaWkgYm9yZGVyUmFkaWlGcm9tU3R5bGUo UmVuZGVyU3R5bGUqIHN0eWxlKQogCiBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhU2xp ZGVyVHJhY2soUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbywgY29u c3QgSW50UmVjdCYgcikKIHsKLSAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0 b1BhcmVudE1lZGlhRWxlbWVudChvKTsKKyAgICBIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1l bnQgPSBwYXJlbnRNZWRpYUVsZW1lbnQoKm8pOwogICAgIGlmICghbWVkaWFFbGVtZW50KQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTYwMCw3ICs2MDAsNyBAQCBib29sIFJlbmRlclRoZW1l R3RrOjpwYWludE1lZGlhVm9sdW1lU2xpZGVyQ29udGFpbmVyKFJlbmRlck9iamVjdCosIGNvbnN0 IFBhaW50SQogCiBib29sIFJlbmRlclRoZW1lR3RrOjpwYWludE1lZGlhVm9sdW1lU2xpZGVyVHJh Y2soUmVuZGVyT2JqZWN0KiByZW5kZXJPYmplY3QsIGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZv LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewotICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxl bWVudCA9IHRvUGFyZW50TWVkaWFFbGVtZW50KHJlbmRlck9iamVjdCk7CisgICAgSFRNTE1lZGlh RWxlbWVudCogbWVkaWFFbGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KCpyZW5kZXJPYmplY3Qp OwogICAgIGlmICghbWVkaWFFbGVtZW50KQogICAgICAgICByZXR1cm4gdHJ1ZTsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHMuY3BwCmluZGV4IDQy OTAwMzk4YTA4ZTc1NzM1MTUxNjY3OGRjYTA4NWFiOWE1MDFmMzQuLjdlYTczZjNlMDc3NDZhYTM1 NjA1NGM5MjU5MDBlNjBlYzNlNTFiMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTWVkaWFDb250cm9scy5jcHAKQEAgLTE3Myw3ICsxNzMsNyBAQCBib29sIFJlbmRl ck1lZGlhQ29udHJvbHM6OnBhaW50TWVkaWFDb250cm9sc1BhcnQoTWVkaWFDb250cm9sRWxlbWVu dFR5cGUgcGFydCwgUgogICAgICAgICB3a0RyYXdNZWRpYVVJUGFydChXS01lZGlhVUlQYXJ0U2Vl a0ZvcndhcmRCdXR0b24sIHBhaW50SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgciwg ZGV0ZXJtaW5lU3RhdGUobykpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIE1lZGlhU2xpZGVy OiB7Ci0gICAgICAgIGlmIChIVE1MTWVkaWFFbGVtZW50KiBtZWRpYUVsZW1lbnQgPSB0b1BhcmVu dE1lZGlhRWxlbWVudChvKSkgeworICAgICAgICBpZiAoSFRNTE1lZGlhRWxlbWVudCogbWVkaWFF bGVtZW50ID0gcGFyZW50TWVkaWFFbGVtZW50KCpvKSkgewogICAgICAgICAgICAgRmxvYXRSZWN0 IHVuem9vbWVkUmVjdCA9IGdldFVuem9vbWVkUmVjdEFuZEFkanVzdEN1cnJlbnRDb250ZXh0KG8s IHBhaW50SW5mbywgcik7CiAgICAgICAgICAgICB3a0RyYXdNZWRpYVNsaWRlclRyYWNrKHBhaW50 SW5mby5jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKSwgdW56b29tZWRSZWN0LCBtZWRpYUVsZW1l bnQtPnBlcmNlbnRMb2FkZWQoKSAqIG1lZGlhRWxlbWVudC0+ZHVyYXRpb24oKSwgbWVkaWFFbGVt ZW50LT5jdXJyZW50VGltZSgpLCBtZWRpYUVsZW1lbnQtPmR1cmF0aW9uKCksIGRldGVybWluZVN0 YXRlKG8pKTsKICAgICAgICAgfQo=