119097 2013-07-25 11:33:26 -0700 Rename <input type='color'> functions in WebPageProxy, WebColorPicker, 2013-07-30 17:57:19 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 61276 0 ruthiecftg webkit-unassigned abecsi bdakin beidson cmarcelo commit-queue jonlee menard ruthiecftg thorton webkit-bug-importer webkit-ews oldest_to_newest 911703 0 ruthiecftg 2013-07-25 11:33:26 -0700 In bug 119025, WebColorChooserProxy was renamed WebColorPicker. To reflect this change, the method names in WebColorPicker and WebPageProxy should be changed (i.e. setColorChooserColor -> setColorPickerColor). 911704 1 webkit-bug-importer 2013-07-25 11:34:06 -0700 <rdar://problem/14549771> 913087 2 207781 ruthiecftg 2013-07-30 16:21:45 -0700 Created attachment 207781 Patch 913088 3 207781 thorton 2013-07-30 16:23:40 -0700 Comment on attachment 207781 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=207781&action=review > Source/WebKit2/ChangeLog:8 > + Renamed INPUT_TYPE_COLOR functions in UIProcess from ...colorChooser to ...colorPicker. Please put the justification for making the WK2 and WebCore names different here. 913089 4 207781 thorton 2013-07-30 16:24:01 -0700 Comment on attachment 207781 Patch Sam r+'d this too. 913090 5 207781 webkit-ews 2013-07-30 16:26:29 -0700 Comment on attachment 207781 Patch Attachment 207781 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1293484 913094 6 207782 ruthiecftg 2013-07-30 16:33:10 -0700 Created attachment 207782 Patch 913097 7 207782 webkit-ews 2013-07-30 16:38:50 -0700 Comment on attachment 207782 Patch Attachment 207782 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1289570 913098 8 207784 ruthiecftg 2013-07-30 16:44:02 -0700 Created attachment 207784 Patch 913099 9 207784 webkit-ews 2013-07-30 16:49:08 -0700 Comment on attachment 207784 Patch Attachment 207784 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1283761 913101 10 207785 ruthiecftg 2013-07-30 16:52:30 -0700 Created attachment 207785 Patch 913105 11 207785 webkit-ews 2013-07-30 16:57:27 -0700 Comment on attachment 207785 Patch Attachment 207785 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1287534 913107 12 207787 ruthiecftg 2013-07-30 17:03:38 -0700 Created attachment 207787 Patch 913110 13 207787 thorton 2013-07-30 17:12:33 -0700 Comment on attachment 207787 Patch r+ assuming all the ports build 913119 14 207787 commit-queue 2013-07-30 17:57:16 -0700 Comment on attachment 207787 Patch Clearing flags on attachment: 207787 Committed r153504: <http://trac.webkit.org/changeset/153504> 913120 15 commit-queue 2013-07-30 17:57:19 -0700 All reviewed patches have been landed. Closing bug. 207781 2013-07-30 16:21:45 -0700 2013-07-30 16:33:07 -0700 Patch bug-119097-20130730162144.patch text/plain 9311 ruthiecftg SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEzLTA3LTMwICBSdXRoIEZv bmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSA8aW5wdXQgdHlwZT0n Y29sb3InPiBmdW5jdGlvbnMgaW4gV2ViUGFnZVByb3h5LCBXZWJDb2xvclBpY2tlcgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTQ1NDk3NzE+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE5MDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVuYW1lZCBJTlBVVF9UWVBFX0NPTE9SIGZ1bmN0aW9ucyBpbiBVSVBy b2Nlc3MgZnJvbSAuLi5jb2xvckNob29zZXIgdG8gLi4uY29sb3JQaWNrZXIuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xv clBpY2tlcjo6ZW5kUGlja2VyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXIu aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpzaG93Q29sb3JQaWNrZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnNldENvbG9yUGlja2VyQ29sb3IpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmVuZENvbG9yUGlja2VyKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpk aWRFbmRDb2xvclBpY2tlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb2xvckNob29zZXIuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJDb2xvckNob29zZXI6OldlYkNvbG9yQ2hvb3Nlcik6CisgICAgICAgIChXZWJL aXQ6OldlYkNvbG9yQ2hvb3Nlcjo6c2V0U2VsZWN0ZWRDb2xvcik6CisgICAgICAgIChXZWJLaXQ6 OldlYkNvbG9yQ2hvb3Nlcjo6ZW5kQ2hvb3Nlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpkaWRFbmRDb2xvclBp Y2tlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwogMjAxMy0wNy0zMCAg QW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFNwZWN1bGF0 aXZlIGZpeCBmb3IgY3Jhc2ggZHVlIHRvIHN0cmluZyBhY2Nlc3Mgb24gbXVsdGlwbGUgdGhyZWFk cwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlja2VyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXIuY3BwCShy ZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNr ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw3ICszOSw3IEBAIFdlYkNvbG9yUGlja2VyOjp+ V2ViQ29sb3JQaWNrZXIoKQogewogfQogCi12b2lkIFdlYkNvbG9yUGlja2VyOjplbmRDaG9vc2Vy KCkKK3ZvaWQgV2ViQ29sb3JQaWNrZXI6OmVuZFBpY2tlcigpCiB7CiAgICAgaWYgKCFtX2NsaWVu dCkKICAgICAgICAgcmV0dXJuOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNv bG9yUGlja2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNv bG9yUGlja2VyLmgJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJDb2xvclBpY2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC01OSw3ICs1OSw3IEBAIHB1Ymxp YzoKIAogICAgIHZvaWQgaW52YWxpZGF0ZSgpIHsgbV9jbGllbnQgPSAwOyB9CiAKLSAgICB2aXJ0 dWFsIHZvaWQgZW5kQ2hvb3NlcigpOworICAgIHZpcnR1YWwgdm9pZCBlbmRQaWNrZXIoKTsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0U2VsZWN0ZWRDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYpOwog CiBwcm90ZWN0ZWQ6CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAkocmV2aXNpb24gMTUzNTAxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5MjYsNyArMjkyNiw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpuZWVkVG91Y2hFdmVudHMoYm9vbCAKICNlbmRpZgogCiAjaWYgRU5BQkxFKElO UFVUX1RZUEVfQ09MT1IpCi12b2lkIFdlYlBhZ2VQcm94eTo6c2hvd0NvbG9yQ2hvb3Nlcihjb25z dCBXZWJDb3JlOjpDb2xvciYgaW5pdGlhbENvbG9yLCBjb25zdCBJbnRSZWN0JiBlbGVtZW50UmVj dCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzaG93Q29sb3JQaWNrZXIoY29uc3QgV2ViQ29yZTo6Q29s b3ImIGluaXRpYWxDb2xvciwgY29uc3QgSW50UmVjdCYgZWxlbWVudFJlY3QpCiB7CiAgICAgQVNT RVJUKCFtX2NvbG9yUGlja2VyKTsKIApAQCAtMjk0MywyMSArMjk0MywyMSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6c2hvd0NvbG9yQ2hvb3Nlcihjb25zCiAKICAgICBtX2NvbG9yUGlja2VyID0gbV9w YWdlQ2xpZW50LT5jcmVhdGVDb2xvclBpY2tlcih0aGlzLCBpbml0aWFsQ29sb3IsIGVsZW1lbnRS ZWN0KTsKICAgICBpZiAoIW1fY29sb3JQaWNrZXIpCi0gICAgICAgIGRpZEVuZENvbG9yQ2hvb3Nl cigpOworICAgICAgICBkaWRFbmRDb2xvclBpY2tlcigpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94 eTo6c2V0Q29sb3JDaG9vc2VyQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGNvbG9yKQordm9p ZCBXZWJQYWdlUHJveHk6OnNldENvbG9yUGlja2VyQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3Im IGNvbG9yKQogewogICAgIEFTU0VSVChtX2NvbG9yUGlja2VyKTsKIAogICAgIG1fY29sb3JQaWNr ZXItPnNldFNlbGVjdGVkQ29sb3IoY29sb3IpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZW5k Q29sb3JDaG9vc2VyKCkKK3ZvaWQgV2ViUGFnZVByb3h5OjplbmRDb2xvclBpY2tlcigpCiB7CiAg ICAgQVNTRVJUKG1fY29sb3JQaWNrZXIpOwogCi0gICAgbV9jb2xvclBpY2tlci0+ZW5kQ2hvb3Nl cigpOworICAgIG1fY29sb3JQaWNrZXItPmVuZFBpY2tlcigpOwogfQogCiB2b2lkIFdlYlBhZ2VQ cm94eTo6ZGlkQ2hvb3NlQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGNvbG9yKQpAQCAtMjk2 OCw3ICsyOTY4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENob29zZUNvbG9yKGNvbnN0IAog ICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkQ2hvb3NlQ29sb3IoY29s b3IpLCBtX3BhZ2VJRCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpkaWRFbmRDb2xvckNob29z ZXIoKQordm9pZCBXZWJQYWdlUHJveHk6OmRpZEVuZENvbG9yUGlja2VyKCkKIHsKICAgICBpZiAo IWlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMjk3OCw3ICsyOTc4LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZEVuZENvbG9yQ2hvb3NlcigpCiAgICAgICAgIG1fY29sb3JQaWNrZXIg PSBudWxscHRyOwogICAgIH0KIAotICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6RGlkRW5kQ29sb3JDaG9vc2VyKCksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OkRpZEVuZENvbG9yUGlja2VyKCksIG1fcGFnZUlEKTsKIAogICAg IG1fY29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5lci0+aW52YWxpZGF0ZSgpOwogICAgIG1fY29sb3JQ aWNrZXJSZXN1bHRMaXN0ZW5lciA9IG51bGxwdHI7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTc0OCwxMSArNzQ4LDYg QEAgcHVibGljOgogCiAgICAgdm9pZCBwb3N0TWVzc2FnZVRvSW5qZWN0ZWRCdW5kbGUoY29uc3Qg U3RyaW5nJiBtZXNzYWdlTmFtZSwgQVBJT2JqZWN0KiBtZXNzYWdlQm9keSk7CiAKLSNpZiBFTkFC TEUoSU5QVVRfVFlQRV9DT0xPUikKLSAgICB2b2lkIHNldENvbG9yQ2hvb3NlckNvbG9yKGNvbnN0 IFdlYkNvcmU6OkNvbG9yJik7Ci0gICAgdm9pZCBlbmRDb2xvckNob29zZXIoKTsKLSNlbmRpZgot CiAgICAgY29uc3QgV2ViTG9hZGVyQ2xpZW50JiBsb2FkZXJDbGllbnQoKSB7IHJldHVybiBtX2xv YWRlckNsaWVudDsgfQogCiAgICAgV2ViQ29yZTo6SW50U2l6ZSBtaW5pbXVtTGF5b3V0U2l6ZSgp IGNvbnN0IHsgcmV0dXJuIG1fbWluaW11bUxheW91dFNpemU7IH0KQEAgLTkwMCw5ICs4OTUsMTEg QEAgcHJpdmF0ZToKICNlbmRpZgogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAg dm9pZCBzaG93Q29sb3JDaG9vc2VyKGNvbnN0IFdlYkNvcmU6OkNvbG9yJiBpbml0aWFsQ29sb3Is IGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKyAgICB2b2lkIHNob3dDb2xvclBpY2tlcihjb25z dCBXZWJDb3JlOjpDb2xvciYgaW5pdGlhbENvbG9yLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7 CisgICAgdm9pZCBzZXRDb2xvclBpY2tlckNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7Cisg ICAgdm9pZCBlbmRDb2xvclBpY2tlcigpOwogICAgIHZvaWQgZGlkQ2hvb3NlQ29sb3IoY29uc3Qg V2ViQ29yZTo6Q29sb3ImKTsKLSAgICB2b2lkIGRpZEVuZENvbG9yQ2hvb3NlcigpOworICAgIHZv aWQgZGlkRW5kQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCiAgICAgdm9pZCBlZGl0b3JTdGF0ZUNo YW5nZWQoY29uc3QgRWRpdG9yU3RhdGUmKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTUzNTAxKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgkod29ya2lu ZyBjb3B5KQpAQCAtOTUsOSArOTUsOSBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogI2Vu ZGlmCiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKLSAgICBTaG93Q29sb3JDaG9vc2Vy KFdlYkNvcmU6OkNvbG9yIGluaXRpYWxDb2xvciwgV2ViQ29yZTo6SW50UmVjdCBlbGVtZW50UmVj dCk7Ci0gICAgU2V0Q29sb3JDaG9vc2VyQ29sb3IoV2ViQ29yZTo6Q29sb3IgY29sb3IpOwotICAg IEVuZENvbG9yQ2hvb3NlcigpOworICAgIFNob3dDb2xvclBpY2tlcihXZWJDb3JlOjpDb2xvciBp bml0aWFsQ29sb3IsIFdlYkNvcmU6OkludFJlY3QgZWxlbWVudFJlY3QpOworICAgIFNldENvbG9y UGlja2VyQ29sb3IoV2ViQ29yZTo6Q29sb3IgY29sb3IpOworICAgIEVuZENvbG9yUGlja2VyKCk7 CiAjZW5kaWYKIAogICAgICMgUG9saWN5IG1lc3NhZ2VzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbG9yQ2hvb3Nlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb2xvckNob29z ZXIuY3BwCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkNvbG9yQ2hvb3Nlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDcg KzQzLDcgQEAgV2ViQ29sb3JDaG9vc2VyOjpXZWJDb2xvckNob29zZXIoV2ViUGFnZQogICAgICwg bV9wYWdlKHBhZ2UpCiB7CiAgICAgbV9wYWdlLT5zZXRBY3RpdmVDb2xvckNob29zZXIodGhpcyk7 Ci0gICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2Vu ZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTaG93Q29sb3JDaG9vc2VyKGluaXRpYWxDb2xvciwg Y2xpZW50LT5lbGVtZW50UmVjdFJlbGF0aXZlVG9Sb290VmlldygpKSwgbV9wYWdlLT5wYWdlSUQo KSk7CisgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+ c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTaG93Q29sb3JQaWNrZXIoaW5pdGlhbENvbG9y LCBjbGllbnQtPmVsZW1lbnRSZWN0UmVsYXRpdmVUb1Jvb3RWaWV3KCkpLCBtX3BhZ2UtPnBhZ2VJ RCgpKTsKIH0KIAogV2ViQ29sb3JDaG9vc2VyOjp+V2ViQ29sb3JDaG9vc2VyKCkKQEAgLTc0LDcg Kzc0LDcgQEAgdm9pZCBXZWJDb2xvckNob29zZXI6OnNldFNlbGVjdGVkQ29sb3IoYwogICAgIGlm ICghbV9wYWdlKQogICAgICAgICByZXR1cm47CiAKLSAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5w YXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNl dENvbG9yQ2hvb3NlckNvbG9yKGNvbG9yKSwgbV9wYWdlLT5wYWdlSUQoKSk7CisgICAgV2ViUHJv Y2Vzczo6c2hhcmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpTZXRDb2xvclBpY2tlckNvbG9yKGNvbG9yKSwgbV9wYWdlLT5wYWdlSUQo KSk7CiB9CiAKIHZvaWQgV2ViQ29sb3JDaG9vc2VyOjplbmRDaG9vc2VyKCkKQEAgLTgyLDcgKzgy LDcgQEAgdm9pZCBXZWJDb2xvckNob29zZXI6OmVuZENob29zZXIoKQogICAgIGlmICghbV9wYWdl KQogICAgICAgICByZXR1cm47CiAKLSAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9j ZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkVuZENvbG9yQ2hv b3NlcigpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5wYXJl bnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkVuZENv bG9yUGlja2VyKCksIG1fcGFnZS0+cGFnZUlEKCkpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg0NCw3ICsyODQ0LDcgQEAgdm9pZCBX ZWJQYWdlOjpzZXRBY3RpdmVDb2xvckNob29zZXIoV2ViQwogICAgIG1fYWN0aXZlQ29sb3JDaG9v c2VyID0gY29sb3JDaG9vc2VyOwogfQogCi12b2lkIFdlYlBhZ2U6OmRpZEVuZENvbG9yQ2hvb3Nl cigpCit2b2lkIFdlYlBhZ2U6OmRpZEVuZENvbG9yUGlja2VyKCkKIHsKICAgICBtX2FjdGl2ZUNv bG9yQ2hvb3Nlci0+ZGlkRW5kQ2hvb3NlcigpOwogfQpJbmRleDogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0y MzUsNyArMjM1LDcgQEAgcHVibGljOgogICAgIFdlYkNvbG9yQ2hvb3NlciogYWN0aXZlQ29sb3JD aG9vc2VyKCkgY29uc3QgeyByZXR1cm4gbV9hY3RpdmVDb2xvckNob29zZXI7IH0KICAgICB2b2lk IHNldEFjdGl2ZUNvbG9yQ2hvb3NlcihXZWJDb2xvckNob29zZXIqKTsKICAgICB2b2lkIGRpZENo b29zZUNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7Ci0gICAgdm9pZCBkaWRFbmRDb2xvckNo b29zZXIoKTsKKyAgICB2b2lkIGRpZEVuZENvbG9yUGlja2VyKCk7CiAjZW5kaWYKIAogICAgIFdl Yk9wZW5QYW5lbFJlc3VsdExpc3RlbmVyKiBhY3RpdmVPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lcigp IGNvbnN0IHsgcmV0dXJuIG1fYWN0aXZlT3BlblBhbmVsUmVzdWx0TGlzdGVuZXIuZ2V0KCk7IH0K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2Vz LmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkod29ya2luZyBjb3B5KQpAQCAtNDgs NyArNDgsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICNlbmRpZgog CiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAgRGlkRW5kQ29sb3JDaG9vc2VyKCkK KyAgICBEaWRFbmRDb2xvclBpY2tlcigpCiAgICAgRGlkQ2hvb3NlQ29sb3IoV2ViQ29yZTo6Q29s b3IgY29sb3IpCiAjZW5kaWYKIAo= 207782 2013-07-30 16:33:10 -0700 2013-07-30 16:43:58 -0700 Patch bug-119097-20130730163309.patch text/plain 9700 ruthiecftg SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDEzLTA3LTMwICBSdXRoIEZv bmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSA8aW5wdXQgdHlwZT0n Y29sb3InPiBmdW5jdGlvbnMgaW4gV2ViUGFnZVByb3h5LCBXZWJDb2xvclBpY2tlcgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTQ1NDk3NzE+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE5MDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW4gYnVnIDExOTAyNSwgV2ViQ29sb3JDaG9vc2VyUHJveHkgd2FzIHJl bmFtZWQgV2ViQ29sb3JQaWNrZXIuIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIFVJUHJvY2VzcyBjb25z aXN0ZW50CisgICAgICAgIGJ5IHJlbmFtaW5nIFVJUHJvY2VzcyBJTlBVVF9UWVBFX0NPTE9SIGZ1 bmN0aW9ucyBmcm9tIC4uLmNvbG9yQ2hvb3NlciB0byAuLi5jb2xvclBpY2tlci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bG9yUGlja2VyOjplbmRQaWNrZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tl ci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OnNob3dDb2xvclBpY2tlcik6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6c2V0Q29sb3JQaWNrZXJDb2xvcik6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6ZW5kQ29sb3JQaWNrZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZEVuZENvbG9yUGlja2VyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbG9yQ2hvb3Nlci5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYkNvbG9yQ2hvb3Nlcjo6V2ViQ29sb3JDaG9vc2VyKToKKyAgICAgICAgKFdl YktpdDo6V2ViQ29sb3JDaG9vc2VyOjpzZXRTZWxlY3RlZENvbG9yKToKKyAgICAgICAgKFdlYktp dDo6V2ViQ29sb3JDaG9vc2VyOjplbmRDaG9vc2VyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmRpZEVuZENvbG9y UGlja2VyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluOgorCiAyMDEzLTA3LTMw ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgU3BlY3Vs YXRpdmUgZml4IGZvciBjcmFzaCBkdWUgdG8gc3RyaW5nIGFjY2VzcyBvbiBtdWx0aXBsZSB0aHJl YWRzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb2xvclBpY2tlci5jcHAJ KHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb2xvclBp Y2tlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDcgKzM5LDcgQEAgV2ViQ29sb3JQaWNrZXI6 On5XZWJDb2xvclBpY2tlcigpCiB7CiB9CiAKLXZvaWQgV2ViQ29sb3JQaWNrZXI6OmVuZENob29z ZXIoKQordm9pZCBXZWJDb2xvclBpY2tlcjo6ZW5kUGlja2VyKCkKIHsKICAgICBpZiAoIW1fY2xp ZW50KQogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29sb3JQaWNrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29sb3JQaWNrZXIuaAkocmV2aXNpb24gMTUzNTAxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbG9yUGlja2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcgQEAgcHVi bGljOgogCiAgICAgcHVibGljOgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hvb3NlQ29sb3Io Y29uc3QgV2ViQ29yZTo6Q29sb3ImKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRFbmRD b2xvckNob29zZXIoKSA9IDA7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRFbmRDb2xvclBpY2tl cigpID0gMDsKICAgICB9OwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViQ29sb3JQaWNrZXI+ IGNyZWF0ZShDbGllbnQqIGNsaWVudCkKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogCiAgICAg dm9pZCBpbnZhbGlkYXRlKCkgeyBtX2NsaWVudCA9IDA7IH0KIAotICAgIHZpcnR1YWwgdm9pZCBl bmRDaG9vc2VyKCk7CisgICAgdmlydHVhbCB2b2lkIGVuZFBpY2tlcigpOwogICAgIHZpcnR1YWwg dm9pZCBzZXRTZWxlY3RlZENvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7CiAKIHByb3RlY3Rl ZDoKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZp c2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjkyNiw3ICsyOTI2LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6 Om5lZWRUb3VjaEV2ZW50cyhib29sIAogI2VuZGlmCiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9D T0xPUikKLXZvaWQgV2ViUGFnZVByb3h5OjpzaG93Q29sb3JDaG9vc2VyKGNvbnN0IFdlYkNvcmU6 OkNvbG9yJiBpbml0aWFsQ29sb3IsIGNvbnN0IEludFJlY3QmIGVsZW1lbnRSZWN0KQordm9pZCBX ZWJQYWdlUHJveHk6OnNob3dDb2xvclBpY2tlcihjb25zdCBXZWJDb3JlOjpDb2xvciYgaW5pdGlh bENvbG9yLCBjb25zdCBJbnRSZWN0JiBlbGVtZW50UmVjdCkKIHsKICAgICBBU1NFUlQoIW1fY29s b3JQaWNrZXIpOwogCkBAIC0yOTQzLDIxICsyOTQzLDIxIEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpz aG93Q29sb3JDaG9vc2VyKGNvbnMKIAogICAgIG1fY29sb3JQaWNrZXIgPSBtX3BhZ2VDbGllbnQt PmNyZWF0ZUNvbG9yUGlja2VyKHRoaXMsIGluaXRpYWxDb2xvciwgZWxlbWVudFJlY3QpOwogICAg IGlmICghbV9jb2xvclBpY2tlcikKLSAgICAgICAgZGlkRW5kQ29sb3JDaG9vc2VyKCk7CisgICAg ICAgIGRpZEVuZENvbG9yUGlja2VyKCk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXRDb2xv ckNob29zZXJDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYgY29sb3IpCit2b2lkIFdlYlBhZ2VQ cm94eTo6c2V0Q29sb3JQaWNrZXJDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYgY29sb3IpCiB7 CiAgICAgQVNTRVJUKG1fY29sb3JQaWNrZXIpOwogCiAgICAgbV9jb2xvclBpY2tlci0+c2V0U2Vs ZWN0ZWRDb2xvcihjb2xvcik7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjplbmRDb2xvckNob29z ZXIoKQordm9pZCBXZWJQYWdlUHJveHk6OmVuZENvbG9yUGlja2VyKCkKIHsKICAgICBBU1NFUlQo bV9jb2xvclBpY2tlcik7CiAKLSAgICBtX2NvbG9yUGlja2VyLT5lbmRDaG9vc2VyKCk7CisgICAg bV9jb2xvclBpY2tlci0+ZW5kUGlja2VyKCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRD aG9vc2VDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYgY29sb3IpCkBAIC0yOTY4LDcgKzI5Njgs NyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hvb3NlQ29sb3IoY29uc3QgCiAgICAgbV9wcm9j ZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRDaG9vc2VDb2xvcihjb2xvciksIG1fcGFn ZUlEKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmRpZEVuZENvbG9yQ2hvb3NlcigpCit2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkRW5kQ29sb3JQaWNrZXIoKQogewogICAgIGlmICghaXNWYWxpZCgp KQogICAgICAgICByZXR1cm47CkBAIC0yOTc4LDcgKzI5NzgsNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6ZGlkRW5kQ29sb3JDaG9vc2VyKCkKICAgICAgICAgbV9jb2xvclBpY2tlciA9IG51bGxwdHI7 CiAgICAgfQogCi0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRFbmRD b2xvckNob29zZXIoKSwgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6RGlkRW5kQ29sb3JQaWNrZXIoKSwgbV9wYWdlSUQpOwogCiAgICAgbV9jb2xvclBp Y2tlclJlc3VsdExpc3RlbmVyLT5pbnZhbGlkYXRlKCk7CiAgICAgbV9jb2xvclBpY2tlclJlc3Vs dExpc3RlbmVyID0gbnVsbHB0cjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtNzQ4LDExICs3NDgsNiBAQCBwdWJsaWM6 CiAKICAgICB2b2lkIHBvc3RNZXNzYWdlVG9JbmplY3RlZEJ1bmRsZShjb25zdCBTdHJpbmcmIG1l c3NhZ2VOYW1lLCBBUElPYmplY3QqIG1lc3NhZ2VCb2R5KTsKIAotI2lmIEVOQUJMRShJTlBVVF9U WVBFX0NPTE9SKQotICAgIHZvaWQgc2V0Q29sb3JDaG9vc2VyQ29sb3IoY29uc3QgV2ViQ29yZTo6 Q29sb3ImKTsKLSAgICB2b2lkIGVuZENvbG9yQ2hvb3NlcigpOwotI2VuZGlmCi0KICAgICBjb25z dCBXZWJMb2FkZXJDbGllbnQmIGxvYWRlckNsaWVudCgpIHsgcmV0dXJuIG1fbG9hZGVyQ2xpZW50 OyB9CiAKICAgICBXZWJDb3JlOjpJbnRTaXplIG1pbmltdW1MYXlvdXRTaXplKCkgY29uc3QgeyBy ZXR1cm4gbV9taW5pbXVtTGF5b3V0U2l6ZTsgfQpAQCAtOTAwLDkgKzg5NSwxMSBAQCBwcml2YXRl OgogI2VuZGlmCiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKLSAgICB2b2lkIHNob3dD b2xvckNob29zZXIoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGluaXRpYWxDb2xvciwgY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYpOworICAgIHZvaWQgc2hvd0NvbG9yUGlja2VyKGNvbnN0IFdlYkNvcmU6 OkNvbG9yJiBpbml0aWFsQ29sb3IsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKyAgICB2b2lk IHNldENvbG9yUGlja2VyQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImKTsKKyAgICB2b2lkIGVu ZENvbG9yUGlja2VyKCk7CiAgICAgdm9pZCBkaWRDaG9vc2VDb2xvcihjb25zdCBXZWJDb3JlOjpD b2xvciYpOwotICAgIHZvaWQgZGlkRW5kQ29sb3JDaG9vc2VyKCk7CisgICAgdm9pZCBkaWRFbmRD b2xvclBpY2tlcigpOwogI2VuZGlmCiAKICAgICB2b2lkIGVkaXRvclN0YXRlQ2hhbmdlZChjb25z dCBFZGl0b3JTdGF0ZSYpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBA IC05NSw5ICs5NSw5IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAjZW5kaWYKIAogI2lm IEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQotICAgIFNob3dDb2xvckNob29zZXIoV2ViQ29yZTo6 Q29sb3IgaW5pdGlhbENvbG9yLCBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRSZWN0KTsKLSAgICBT ZXRDb2xvckNob29zZXJDb2xvcihXZWJDb3JlOjpDb2xvciBjb2xvcik7Ci0gICAgRW5kQ29sb3JD aG9vc2VyKCk7CisgICAgU2hvd0NvbG9yUGlja2VyKFdlYkNvcmU6OkNvbG9yIGluaXRpYWxDb2xv ciwgV2ViQ29yZTo6SW50UmVjdCBlbGVtZW50UmVjdCk7CisgICAgU2V0Q29sb3JQaWNrZXJDb2xv cihXZWJDb3JlOjpDb2xvciBjb2xvcik7CisgICAgRW5kQ29sb3JQaWNrZXIoKTsKICNlbmRpZgog CiAgICAgIyBQb2xpY3kgbWVzc2FnZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViQ29sb3JDaG9vc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbG9yQ2hvb3Nlci5jcHAJKHJl dmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViQ29sb3JDaG9vc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBX ZWJDb2xvckNob29zZXI6OldlYkNvbG9yQ2hvb3NlcihXZWJQYWdlCiAgICAgLCBtX3BhZ2UocGFn ZSkKIHsKICAgICBtX3BhZ2UtPnNldEFjdGl2ZUNvbG9yQ2hvb3Nlcih0aGlzKTsKLSAgICBXZWJQ cm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlNob3dDb2xvckNob29zZXIoaW5pdGlhbENvbG9yLCBjbGllbnQtPmVs ZW1lbnRSZWN0UmVsYXRpdmVUb1Jvb3RWaWV3KCkpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICBX ZWJQcm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3Nh Z2VzOjpXZWJQYWdlUHJveHk6OlNob3dDb2xvclBpY2tlcihpbml0aWFsQ29sb3IsIGNsaWVudC0+ ZWxlbWVudFJlY3RSZWxhdGl2ZVRvUm9vdFZpZXcoKSksIG1fcGFnZS0+cGFnZUlEKCkpOwogfQog CiBXZWJDb2xvckNob29zZXI6On5XZWJDb2xvckNob29zZXIoKQpAQCAtNzQsNyArNzQsNyBAQCB2 b2lkIFdlYkNvbG9yQ2hvb3Nlcjo6c2V0U2VsZWN0ZWRDb2xvcihjCiAgICAgaWYgKCFtX3BhZ2Up CiAgICAgICAgIHJldHVybjsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nl c3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0Q29sb3JDaG9v c2VyQ29sb3IoY29sb3IpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFy ZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OlNldENvbG9yUGlja2VyQ29sb3IoY29sb3IpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKIH0KIAog dm9pZCBXZWJDb2xvckNob29zZXI6OmVuZENob29zZXIoKQpAQCAtODIsNyArODIsNyBAQCB2b2lk IFdlYkNvbG9yQ2hvb3Nlcjo6ZW5kQ2hvb3NlcigpCiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAg IHJldHVybjsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25uZWN0 aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RW5kQ29sb3JDaG9vc2VyKCksIG1f cGFnZS0+cGFnZUlEKCkpOworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3ND b25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RW5kQ29sb3JQaWNrZXIo KSwgbV9wYWdlLT5wYWdlSUQoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNp b24gMTUzNTAxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yODQ0LDcgKzI4NDQsNyBAQCB2b2lkIFdlYlBhZ2U6OnNl dEFjdGl2ZUNvbG9yQ2hvb3NlcihXZWJDCiAgICAgbV9hY3RpdmVDb2xvckNob29zZXIgPSBjb2xv ckNob29zZXI7CiB9CiAKLXZvaWQgV2ViUGFnZTo6ZGlkRW5kQ29sb3JDaG9vc2VyKCkKK3ZvaWQg V2ViUGFnZTo6ZGlkRW5kQ29sb3JQaWNrZXIoKQogewogICAgIG1fYWN0aXZlQ29sb3JDaG9vc2Vy LT5kaWRFbmRDaG9vc2VyKCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNSw3ICsyMzUs NyBAQCBwdWJsaWM6CiAgICAgV2ViQ29sb3JDaG9vc2VyKiBhY3RpdmVDb2xvckNob29zZXIoKSBj b25zdCB7IHJldHVybiBtX2FjdGl2ZUNvbG9yQ2hvb3NlcjsgfQogICAgIHZvaWQgc2V0QWN0aXZl Q29sb3JDaG9vc2VyKFdlYkNvbG9yQ2hvb3NlciopOwogICAgIHZvaWQgZGlkQ2hvb3NlQ29sb3Io Y29uc3QgV2ViQ29yZTo6Q29sb3ImKTsKLSAgICB2b2lkIGRpZEVuZENvbG9yQ2hvb3NlcigpOwor ICAgIHZvaWQgZGlkRW5kQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCiAgICAgV2ViT3BlblBhbmVs UmVzdWx0TGlzdGVuZXIqIGFjdGl2ZU9wZW5QYW5lbFJlc3VsdExpc3RlbmVyKCkgY29uc3QgeyBy ZXR1cm4gbV9hY3RpdmVPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lci5nZXQoKTsgfQpJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW4JKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCw3IEBA IG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogI2VuZGlmCiAKICNpZiBFTkFC TEUoSU5QVVRfVFlQRV9DT0xPUikKLSAgICBEaWRFbmRDb2xvckNob29zZXIoKQorICAgIERpZEVu ZENvbG9yUGlja2VyKCkKICAgICBEaWRDaG9vc2VDb2xvcihXZWJDb3JlOjpDb2xvciBjb2xvcikK ICNlbmRpZgogCg== 207784 2013-07-30 16:44:02 -0700 2013-07-30 16:52:27 -0700 Patch bug-119097-20130730164401.patch text/plain 10581 ruthiecftg SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA3LTMwICBSdXRoIEZv bmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSA8aW5wdXQgdHlwZT0n Y29sb3InPiBmdW5jdGlvbnMgaW4gV2ViUGFnZVByb3h5LCBXZWJDb2xvclBpY2tlcgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTQ1NDk3NzE+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE5MDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW4gYnVnIDExOTAyNSwgV2ViQ29sb3JDaG9vc2VyUHJveHkgd2FzIHJl bmFtZWQgV2ViQ29sb3JQaWNrZXIuIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIFVJUHJvY2VzcyBjb25z aXN0ZW50CisgICAgICAgIGJ5IHJlbmFtaW5nIFVJUHJvY2VzcyBJTlBVVF9UWVBFX0NPTE9SIGZ1 bmN0aW9ucyBmcm9tIC4uLmNvbG9yQ2hvb3NlciB0byAuLi5jb2xvclBpY2tlci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bG9yUGlja2VyOjplbmRQaWNrZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tl ci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tlclJlc3VsdExpc3RlbmVyUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xvclBpY2tlclJlc3VsdExpc3RlbmVyUHJv eHk6OnNldENvbG9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG93Q29sb3JQaWNrZXIpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldENvbG9yUGlja2VyQ29sb3IpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmVuZENvbG9yUGlja2VyKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRFbmRDb2xvclBpY2tlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb2xvckNob29zZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xvckNob29zZXI6OldlYkNvbG9yQ2hvb3Nlcik6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbG9yQ2hvb3Nlcjo6c2V0U2VsZWN0ZWRDb2xvcik6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbG9yQ2hvb3Nlcjo6ZW5kQ2hvb3Nlcik6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpk aWRFbmRDb2xvclBpY2tlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwog MjAxMy0wNy0zMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIFNwZWN1bGF0aXZlIGZpeCBmb3IgY3Jhc2ggZHVlIHRvIHN0cmluZyBhY2Nlc3Mgb24gbXVs dGlwbGUgdGhyZWFkcwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlj a2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQ aWNrZXIuY3BwCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViQ29sb3JQaWNrZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOSwxMiArMzksMTIgQEAgV2Vi Q29sb3JQaWNrZXI6On5XZWJDb2xvclBpY2tlcigpCiB7CiB9CiAKLXZvaWQgV2ViQ29sb3JQaWNr ZXI6OmVuZENob29zZXIoKQordm9pZCBXZWJDb2xvclBpY2tlcjo6ZW5kUGlja2VyKCkKIHsKICAg ICBpZiAoIW1fY2xpZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NsaWVudC0+ZGlkRW5k Q29sb3JDaG9vc2VyKCk7CisgICAgbV9jbGllbnQtPmRpZEVuZENvbG9yUGlja2VyKCk7CiB9CiAK IHZvaWQgV2ViQ29sb3JQaWNrZXI6OnNldFNlbGVjdGVkQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29s b3ImIGNvbG9yKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlja2Vy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlja2Vy LmgJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb2xv clBpY2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKIAogICAg IHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZENob29zZUNvbG9yKGNvbnN0IFdlYkNv cmU6OkNvbG9yJikgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRW5kQ29sb3JDaG9vc2Vy KCkgPSAwOworICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRW5kQ29sb3JQaWNrZXIoKSA9IDA7CiAg ICAgfTsKIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkNvbG9yUGlja2VyPiBjcmVhdGUoQ2xp ZW50KiBjbGllbnQpCkBAIC01OSw3ICs1OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgaW52YWxp ZGF0ZSgpIHsgbV9jbGllbnQgPSAwOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgZW5kQ2hvb3Nlcigp OworICAgIHZpcnR1YWwgdm9pZCBlbmRQaWNrZXIoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Vs ZWN0ZWRDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYpOwogCiBwcm90ZWN0ZWQ6CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5lclByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNr ZXJSZXN1bHRMaXN0ZW5lclByb3h5LmNwcAkocmV2aXNpb24gMTUzNTAxKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXJQcm94eS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTUxLDggKzUxLDggQEAgdm9pZCBXZWJDb2xvclBpY2tlclJlc3VsdExp c3RlbmVyUHJveHk6OgogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm47CiAKLSAgICBt X3BhZ2UtPnNldENvbG9yQ2hvb3NlckNvbG9yKFdlYkNvcmU6OkNvbG9yKGNvbG9yKSk7Ci0gICAg bV9wYWdlLT5lbmRDb2xvckNob29zZXIoKTsKKyAgICBtX3BhZ2UtPnNldENvbG9yUGlja2VyQ29s b3IoV2ViQ29yZTo6Q29sb3IoY29sb3IpKTsKKyAgICBtX3BhZ2UtPmVuZENvbG9yUGlja2VyKCk7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTI2LDcgKzI5 MjYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bmVlZFRvdWNoRXZlbnRzKGJvb2wgCiAjZW5kaWYK IAogI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQotdm9pZCBXZWJQYWdlUHJveHk6OnNob3dD b2xvckNob29zZXIoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGluaXRpYWxDb2xvciwgY29uc3QgSW50 UmVjdCYgZWxlbWVudFJlY3QpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd0NvbG9yUGlja2VyKGNv bnN0IFdlYkNvcmU6OkNvbG9yJiBpbml0aWFsQ29sb3IsIGNvbnN0IEludFJlY3QmIGVsZW1lbnRS ZWN0KQogewogICAgIEFTU0VSVCghbV9jb2xvclBpY2tlcik7CiAKQEAgLTI5NDMsMjEgKzI5NDMs MjEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNob3dDb2xvckNob29zZXIoY29ucwogCiAgICAgbV9j b2xvclBpY2tlciA9IG1fcGFnZUNsaWVudC0+Y3JlYXRlQ29sb3JQaWNrZXIodGhpcywgaW5pdGlh bENvbG9yLCBlbGVtZW50UmVjdCk7CiAgICAgaWYgKCFtX2NvbG9yUGlja2VyKQotICAgICAgICBk aWRFbmRDb2xvckNob29zZXIoKTsKKyAgICAgICAgZGlkRW5kQ29sb3JQaWNrZXIoKTsKIH0KIAot dm9pZCBXZWJQYWdlUHJveHk6OnNldENvbG9yQ2hvb3NlckNvbG9yKGNvbnN0IFdlYkNvcmU6OkNv bG9yJiBjb2xvcikKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRDb2xvclBpY2tlckNvbG9yKGNvbnN0 IFdlYkNvcmU6OkNvbG9yJiBjb2xvcikKIHsKICAgICBBU1NFUlQobV9jb2xvclBpY2tlcik7CiAK ICAgICBtX2NvbG9yUGlja2VyLT5zZXRTZWxlY3RlZENvbG9yKGNvbG9yKTsKIH0KIAotdm9pZCBX ZWJQYWdlUHJveHk6OmVuZENvbG9yQ2hvb3NlcigpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZW5kQ29s b3JQaWNrZXIoKQogewogICAgIEFTU0VSVChtX2NvbG9yUGlja2VyKTsKIAotICAgIG1fY29sb3JQ aWNrZXItPmVuZENob29zZXIoKTsKKyAgICBtX2NvbG9yUGlja2VyLT5lbmRQaWNrZXIoKTsKIH0K IAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENob29zZUNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9y JiBjb2xvcikKQEAgLTI5NjgsNyArMjk2OCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDaG9v c2VDb2xvcihjb25zdCAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRp ZENob29zZUNvbG9yKGNvbG9yKSwgbV9wYWdlSUQpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkRW5kQ29sb3JDaG9vc2VyKCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpkaWRFbmRDb2xvclBpY2tl cigpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTI5NzgsNyAr Mjk3OCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRFbmRDb2xvckNob29zZXIoKQogICAgICAg ICBtX2NvbG9yUGlja2VyID0gbnVsbHB0cjsKICAgICB9CiAKLSAgICBtX3Byb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OkRpZEVuZENvbG9yQ2hvb3NlcigpLCBtX3BhZ2VJRCk7CisgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRFbmRDb2xvclBpY2tlcigpLCBt X3BhZ2VJRCk7CiAKICAgICBtX2NvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXItPmludmFsaWRhdGUo KTsKICAgICBtX2NvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXIgPSBudWxscHRyOwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTUzNTAxKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBA IC03NDgsMTEgKzc0OCw2IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcG9zdE1lc3NhZ2VUb0luamVj dGVkQnVuZGxlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSU9iamVjdCogbWVzc2FnZUJv ZHkpOwogCi0jaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAgdm9pZCBzZXRDb2xvckNo b29zZXJDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYpOwotICAgIHZvaWQgZW5kQ29sb3JDaG9v c2VyKCk7Ci0jZW5kaWYKLQogICAgIGNvbnN0IFdlYkxvYWRlckNsaWVudCYgbG9hZGVyQ2xpZW50 KCkgeyByZXR1cm4gbV9sb2FkZXJDbGllbnQ7IH0KIAogICAgIFdlYkNvcmU6OkludFNpemUgbWlu aW11bUxheW91dFNpemUoKSBjb25zdCB7IHJldHVybiBtX21pbmltdW1MYXlvdXRTaXplOyB9CkBA IC05MDAsOSArODk1LDExIEBAIHByaXZhdGU6CiAjZW5kaWYKIAogI2lmIEVOQUJMRShJTlBVVF9U WVBFX0NPTE9SKQotICAgIHZvaWQgc2hvd0NvbG9yQ2hvb3Nlcihjb25zdCBXZWJDb3JlOjpDb2xv ciYgaW5pdGlhbENvbG9yLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisgICAgdm9pZCBzaG93 Q29sb3JQaWNrZXIoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGluaXRpYWxDb2xvciwgY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYpOworICAgIHZvaWQgc2V0Q29sb3JQaWNrZXJDb2xvcihjb25zdCBXZWJD b3JlOjpDb2xvciYpOworICAgIHZvaWQgZW5kQ29sb3JQaWNrZXIoKTsKICAgICB2b2lkIGRpZENo b29zZUNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7Ci0gICAgdm9pZCBkaWRFbmRDb2xvckNo b29zZXIoKTsKKyAgICB2b2lkIGRpZEVuZENvbG9yUGlja2VyKCk7CiAjZW5kaWYKIAogICAgIHZv aWQgZWRpdG9yU3RhdGVDaGFuZ2VkKGNvbnN0IEVkaXRvclN0YXRlJik7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlz aW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVz c2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTk1LDkgKzk1LDkgQEAgbWVzc2FnZXMgLT4gV2Vi UGFnZVByb3h5IHsKICNlbmRpZgogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAg U2hvd0NvbG9yQ2hvb3NlcihXZWJDb3JlOjpDb2xvciBpbml0aWFsQ29sb3IsIFdlYkNvcmU6Oklu dFJlY3QgZWxlbWVudFJlY3QpOwotICAgIFNldENvbG9yQ2hvb3NlckNvbG9yKFdlYkNvcmU6OkNv bG9yIGNvbG9yKTsKLSAgICBFbmRDb2xvckNob29zZXIoKTsKKyAgICBTaG93Q29sb3JQaWNrZXIo V2ViQ29yZTo6Q29sb3IgaW5pdGlhbENvbG9yLCBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRSZWN0 KTsKKyAgICBTZXRDb2xvclBpY2tlckNvbG9yKFdlYkNvcmU6OkNvbG9yIGNvbG9yKTsKKyAgICBF bmRDb2xvclBpY2tlcigpOwogI2VuZGlmCiAKICAgICAjIFBvbGljeSBtZXNzYWdlcwpJbmRleDog U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb2xvckNob29zZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViQ29sb3JDaG9vc2VyLmNwcAkocmV2aXNpb24gMTUzNTAxKQorKysgU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb2xvckNob29zZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC00Myw3ICs0Myw3IEBAIFdlYkNvbG9yQ2hvb3Nlcjo6V2ViQ29sb3JDaG9vc2Vy KFdlYlBhZ2UKICAgICAsIG1fcGFnZShwYWdlKQogewogICAgIG1fcGFnZS0+c2V0QWN0aXZlQ29s b3JDaG9vc2VyKHRoaXMpOwotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3ND b25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2hvd0NvbG9yQ2hvb3Nl cihpbml0aWFsQ29sb3IsIGNsaWVudC0+ZWxlbWVudFJlY3RSZWxhdGl2ZVRvUm9vdFZpZXcoKSks IG1fcGFnZS0+cGFnZUlEKCkpOworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nl c3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2hvd0NvbG9yUGlj a2VyKGluaXRpYWxDb2xvciwgY2xpZW50LT5lbGVtZW50UmVjdFJlbGF0aXZlVG9Sb290Vmlldygp KSwgbV9wYWdlLT5wYWdlSUQoKSk7CiB9CiAKIFdlYkNvbG9yQ2hvb3Nlcjo6fldlYkNvbG9yQ2hv b3NlcigpCkBAIC03NCw3ICs3NCw3IEBAIHZvaWQgV2ViQ29sb3JDaG9vc2VyOjpzZXRTZWxlY3Rl ZENvbG9yKGMKICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV2ViUHJv Y2Vzczo6c2hhcmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZVByb3h5OjpTZXRDb2xvckNob29zZXJDb2xvcihjb2xvciksIG1fcGFnZS0+cGFnZUlE KCkpOworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCkt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0Q29sb3JQaWNrZXJDb2xvcihjb2xvciks IG1fcGFnZS0+cGFnZUlEKCkpOwogfQogCiB2b2lkIFdlYkNvbG9yQ2hvb3Nlcjo6ZW5kQ2hvb3Nl cigpCkBAIC04Miw3ICs4Miw3IEBAIHZvaWQgV2ViQ29sb3JDaG9vc2VyOjplbmRDaG9vc2VyKCkK ICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV2ViUHJvY2Vzczo6c2hh cmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVBy b3h5OjpFbmRDb2xvckNob29zZXIoKSwgbV9wYWdlLT5wYWdlSUQoKSk7CisgICAgV2ViUHJvY2Vz czo6c2hhcmVkKCkucGFyZW50UHJvY2Vzc0Nvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZVByb3h5OjpFbmRDb2xvclBpY2tlcigpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKIH0KIAogfSAv LyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuY3BwCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4NDQsNyAr Mjg0NCw3IEBAIHZvaWQgV2ViUGFnZTo6c2V0QWN0aXZlQ29sb3JDaG9vc2VyKFdlYkMKICAgICBt X2FjdGl2ZUNvbG9yQ2hvb3NlciA9IGNvbG9yQ2hvb3NlcjsKIH0KIAotdm9pZCBXZWJQYWdlOjpk aWRFbmRDb2xvckNob29zZXIoKQordm9pZCBXZWJQYWdlOjpkaWRFbmRDb2xvclBpY2tlcigpCiB7 CiAgICAgbV9hY3RpdmVDb2xvckNob29zZXItPmRpZEVuZENob29zZXIoKTsKIH0KSW5kZXg6IFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkocmV2aXNpb24gMTUz NTAxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAkod29y a2luZyBjb3B5KQpAQCAtMjM1LDcgKzIzNSw3IEBAIHB1YmxpYzoKICAgICBXZWJDb2xvckNob29z ZXIqIGFjdGl2ZUNvbG9yQ2hvb3NlcigpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aXZlQ29sb3JDaG9v c2VyOyB9CiAgICAgdm9pZCBzZXRBY3RpdmVDb2xvckNob29zZXIoV2ViQ29sb3JDaG9vc2VyKik7 CiAgICAgdm9pZCBkaWRDaG9vc2VDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYpOwotICAgIHZv aWQgZGlkRW5kQ29sb3JDaG9vc2VyKCk7CisgICAgdm9pZCBkaWRFbmRDb2xvclBpY2tlcigpOwog I2VuZGlmCiAKICAgICBXZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lciogYWN0aXZlT3BlblBhbmVs UmVzdWx0TGlzdGVuZXIoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2ZU9wZW5QYW5lbFJlc3VsdExp c3RlbmVyLmdldCgpOyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgkocmV2aXNpb24gMTUzNTAxKQorKysgU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHdvcmtp bmcgY29weSkKQEAgLTQ4LDcgKzQ4LDcgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNl aXZlciB7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQotICAgIERpZEVu ZENvbG9yQ2hvb3NlcigpCisgICAgRGlkRW5kQ29sb3JQaWNrZXIoKQogICAgIERpZENob29zZUNv bG9yKFdlYkNvcmU6OkNvbG9yIGNvbG9yKQogI2VuZGlmCiAK 207785 2013-07-30 16:52:30 -0700 2013-07-30 17:03:34 -0700 Patch bug-119097-20130730165229.patch text/plain 10495 ruthiecftg SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA3LTMwICBSdXRoIEZv bmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSA8aW5wdXQgdHlwZT0n Y29sb3InPiBmdW5jdGlvbnMgaW4gV2ViUGFnZVByb3h5LCBXZWJDb2xvclBpY2tlcgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTQ1NDk3NzE+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE5MDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW4gYnVnIDExOTAyNSwgV2ViQ29sb3JDaG9vc2VyUHJveHkgd2FzIHJl bmFtZWQgV2ViQ29sb3JQaWNrZXIuIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIFVJUHJvY2VzcyBjb25z aXN0ZW50CisgICAgICAgIGJ5IHJlbmFtaW5nIFVJUHJvY2VzcyBJTlBVVF9UWVBFX0NPTE9SIGZ1 bmN0aW9ucyBmcm9tIC4uLmNvbG9yQ2hvb3NlciB0byAuLi5jb2xvclBpY2tlci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bG9yUGlja2VyOjplbmRQaWNrZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tl ci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tlclJlc3VsdExpc3RlbmVyUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xvclBpY2tlclJlc3VsdExpc3RlbmVyUHJv eHk6OnNldENvbG9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG93Q29sb3JQaWNrZXIpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldENvbG9yUGlja2VyQ29sb3IpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmVuZENvbG9yUGlja2VyKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRFbmRDb2xvclBpY2tlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDb2xvckNob29zZXIuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xvckNob29zZXI6OldlYkNvbG9yQ2hvb3Nlcik6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbG9yQ2hvb3Nlcjo6c2V0U2VsZWN0ZWRDb2xvcik6CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbG9yQ2hvb3Nlcjo6ZW5kQ2hvb3Nlcik6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpk aWRFbmRDb2xvclBpY2tlcik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKwog MjAxMy0wNy0zMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAg ICAgIFNwZWN1bGF0aXZlIGZpeCBmb3IgY3Jhc2ggZHVlIHRvIHN0cmluZyBhY2Nlc3Mgb24gbXVs dGlwbGUgdGhyZWFkcwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlj a2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQ aWNrZXIuY3BwCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViQ29sb3JQaWNrZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOSwxMiArMzksMTIgQEAgV2Vi Q29sb3JQaWNrZXI6On5XZWJDb2xvclBpY2tlcigpCiB7CiB9CiAKLXZvaWQgV2ViQ29sb3JQaWNr ZXI6OmVuZENob29zZXIoKQordm9pZCBXZWJDb2xvclBpY2tlcjo6ZW5kUGlja2VyKCkKIHsKICAg ICBpZiAoIW1fY2xpZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2NsaWVudC0+ZGlkRW5k Q29sb3JDaG9vc2VyKCk7CisgICAgbV9jbGllbnQtPmRpZEVuZENvbG9yUGlja2VyKCk7CiB9CiAK IHZvaWQgV2ViQ29sb3JQaWNrZXI6OnNldFNlbGVjdGVkQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29s b3ImIGNvbG9yKQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlja2Vy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlja2Vy LmgJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb2xv clBpY2tlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw3IEBAIHB1YmxpYzoKIAogICAg IHB1YmxpYzoKICAgICAgICAgdmlydHVhbCB2b2lkIGRpZENob29zZUNvbG9yKGNvbnN0IFdlYkNv cmU6OkNvbG9yJikgPSAwOwotICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRW5kQ29sb3JDaG9vc2Vy KCkgPSAwOworICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkRW5kQ29sb3JQaWNrZXIoKSA9IDA7CiAg ICAgfTsKIAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkNvbG9yUGlja2VyPiBjcmVhdGUoQ2xp ZW50KiBjbGllbnQpCkBAIC01OSw3ICs1OSw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgaW52YWxp ZGF0ZSgpIHsgbV9jbGllbnQgPSAwOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgZW5kQ2hvb3Nlcigp OworICAgIHZpcnR1YWwgdm9pZCBlbmRQaWNrZXIoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Vs ZWN0ZWRDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYpOwogCiBwcm90ZWN0ZWQ6CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5lclByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNr ZXJSZXN1bHRMaXN0ZW5lclByb3h5LmNwcAkocmV2aXNpb24gMTUzNTAxKQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXJQcm94eS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTUxLDggKzUxLDggQEAgdm9pZCBXZWJDb2xvclBpY2tlclJlc3VsdExp c3RlbmVyUHJveHk6OgogICAgIGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm47CiAKLSAgICBt X3BhZ2UtPnNldENvbG9yQ2hvb3NlckNvbG9yKFdlYkNvcmU6OkNvbG9yKGNvbG9yKSk7Ci0gICAg bV9wYWdlLT5lbmRDb2xvckNob29zZXIoKTsKKyAgICBtX3BhZ2UtPnNldENvbG9yUGlja2VyQ29s b3IoV2ViQ29yZTo6Q29sb3IoY29sb3IpKTsKKyAgICBtX3BhZ2UtPmVuZENvbG9yUGlja2VyKCk7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOTI2LDcgKzI5 MjYsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bmVlZFRvdWNoRXZlbnRzKGJvb2wgCiAjZW5kaWYK IAogI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQotdm9pZCBXZWJQYWdlUHJveHk6OnNob3dD b2xvckNob29zZXIoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGluaXRpYWxDb2xvciwgY29uc3QgSW50 UmVjdCYgZWxlbWVudFJlY3QpCit2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd0NvbG9yUGlja2VyKGNv bnN0IFdlYkNvcmU6OkNvbG9yJiBpbml0aWFsQ29sb3IsIGNvbnN0IEludFJlY3QmIGVsZW1lbnRS ZWN0KQogewogICAgIEFTU0VSVCghbV9jb2xvclBpY2tlcik7CiAKQEAgLTI5NDMsMjEgKzI5NDMs MjEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNob3dDb2xvckNob29zZXIoY29ucwogCiAgICAgbV9j b2xvclBpY2tlciA9IG1fcGFnZUNsaWVudC0+Y3JlYXRlQ29sb3JQaWNrZXIodGhpcywgaW5pdGlh bENvbG9yLCBlbGVtZW50UmVjdCk7CiAgICAgaWYgKCFtX2NvbG9yUGlja2VyKQotICAgICAgICBk aWRFbmRDb2xvckNob29zZXIoKTsKKyAgICAgICAgZGlkRW5kQ29sb3JQaWNrZXIoKTsKIH0KIAot dm9pZCBXZWJQYWdlUHJveHk6OnNldENvbG9yQ2hvb3NlckNvbG9yKGNvbnN0IFdlYkNvcmU6OkNv bG9yJiBjb2xvcikKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRDb2xvclBpY2tlckNvbG9yKGNvbnN0 IFdlYkNvcmU6OkNvbG9yJiBjb2xvcikKIHsKICAgICBBU1NFUlQobV9jb2xvclBpY2tlcik7CiAK ICAgICBtX2NvbG9yUGlja2VyLT5zZXRTZWxlY3RlZENvbG9yKGNvbG9yKTsKIH0KIAotdm9pZCBX ZWJQYWdlUHJveHk6OmVuZENvbG9yQ2hvb3NlcigpCit2b2lkIFdlYlBhZ2VQcm94eTo6ZW5kQ29s b3JQaWNrZXIoKQogewogICAgIEFTU0VSVChtX2NvbG9yUGlja2VyKTsKIAotICAgIG1fY29sb3JQ aWNrZXItPmVuZENob29zZXIoKTsKKyAgICBtX2NvbG9yUGlja2VyLT5lbmRQaWNrZXIoKTsKIH0K IAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZENob29zZUNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9y JiBjb2xvcikKQEAgLTI5NjgsNyArMjk2OCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDaG9v c2VDb2xvcihjb25zdCAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRp ZENob29zZUNvbG9yKGNvbG9yKSwgbV9wYWdlSUQpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkRW5kQ29sb3JDaG9vc2VyKCkKK3ZvaWQgV2ViUGFnZVByb3h5OjpkaWRFbmRDb2xvclBpY2tl cigpCiB7CiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKQEAgLTI5NzgsNyAr Mjk3OCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRFbmRDb2xvckNob29zZXIoKQogICAgICAg ICBtX2NvbG9yUGlja2VyID0gbnVsbHB0cjsKICAgICB9CiAKLSAgICBtX3Byb2Nlc3MtPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2U6OkRpZEVuZENvbG9yQ2hvb3NlcigpLCBtX3BhZ2VJRCk7CisgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpEaWRFbmRDb2xvclBpY2tlcigpLCBt X3BhZ2VJRCk7CiAKICAgICBtX2NvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXItPmludmFsaWRhdGUo KTsKICAgICBtX2NvbG9yUGlja2VyUmVzdWx0TGlzdGVuZXIgPSBudWxscHRyOwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAkocmV2aXNpb24gMTUzNTAxKQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBA IC03NDksOCArNzQ5LDggQEAgcHVibGljOgogICAgIHZvaWQgcG9zdE1lc3NhZ2VUb0luamVjdGVk QnVuZGxlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQSU9iamVjdCogbWVzc2FnZUJvZHkp OwogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAgdm9pZCBzZXRDb2xvckNob29z ZXJDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYpOwotICAgIHZvaWQgZW5kQ29sb3JDaG9vc2Vy KCk7CisgICAgdm9pZCBzZXRDb2xvclBpY2tlckNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7 CisgICAgdm9pZCBlbmRDb2xvclBpY2tlcigpOwogI2VuZGlmCiAKICAgICBjb25zdCBXZWJMb2Fk ZXJDbGllbnQmIGxvYWRlckNsaWVudCgpIHsgcmV0dXJuIG1fbG9hZGVyQ2xpZW50OyB9CkBAIC05 MDAsOSArOTAwLDkgQEAgcHJpdmF0ZToKICNlbmRpZgogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVf Q09MT1IpCi0gICAgdm9pZCBzaG93Q29sb3JDaG9vc2VyKGNvbnN0IFdlYkNvcmU6OkNvbG9yJiBp bml0aWFsQ29sb3IsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKyAgICB2b2lkIHNob3dDb2xv clBpY2tlcihjb25zdCBXZWJDb3JlOjpDb2xvciYgaW5pdGlhbENvbG9yLCBjb25zdCBXZWJDb3Jl OjpJbnRSZWN0Jik7CiAgICAgdm9pZCBkaWRDaG9vc2VDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xv ciYpOwotICAgIHZvaWQgZGlkRW5kQ29sb3JDaG9vc2VyKCk7CisgICAgdm9pZCBkaWRFbmRDb2xv clBpY2tlcigpOwogI2VuZGlmCiAKICAgICB2b2lkIGVkaXRvclN0YXRlQ2hhbmdlZChjb25zdCBF ZGl0b3JTdGF0ZSYpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5Lm1lc3NhZ2VzLmluCShyZXZpc2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC05 NSw5ICs5NSw5IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAjZW5kaWYKIAogI2lmIEVO QUJMRShJTlBVVF9UWVBFX0NPTE9SKQotICAgIFNob3dDb2xvckNob29zZXIoV2ViQ29yZTo6Q29s b3IgaW5pdGlhbENvbG9yLCBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRSZWN0KTsKLSAgICBTZXRD b2xvckNob29zZXJDb2xvcihXZWJDb3JlOjpDb2xvciBjb2xvcik7Ci0gICAgRW5kQ29sb3JDaG9v c2VyKCk7CisgICAgU2hvd0NvbG9yUGlja2VyKFdlYkNvcmU6OkNvbG9yIGluaXRpYWxDb2xvciwg V2ViQ29yZTo6SW50UmVjdCBlbGVtZW50UmVjdCk7CisgICAgU2V0Q29sb3JQaWNrZXJDb2xvcihX ZWJDb3JlOjpDb2xvciBjb2xvcik7CisgICAgRW5kQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCiAg ICAgIyBQb2xpY3kgbWVzc2FnZXMKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQ29sb3JDaG9vc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbG9yQ2hvb3Nlci5jcHAJKHJldmlz aW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViQ29sb3JDaG9vc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBXZWJD b2xvckNob29zZXI6OldlYkNvbG9yQ2hvb3NlcihXZWJQYWdlCiAgICAgLCBtX3BhZ2UocGFnZSkK IHsKICAgICBtX3BhZ2UtPnNldEFjdGl2ZUNvbG9yQ2hvb3Nlcih0aGlzKTsKLSAgICBXZWJQcm9j ZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlNob3dDb2xvckNob29zZXIoaW5pdGlhbENvbG9yLCBjbGllbnQtPmVsZW1l bnRSZWN0UmVsYXRpdmVUb1Jvb3RWaWV3KCkpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICBXZWJQ cm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlUHJveHk6OlNob3dDb2xvclBpY2tlcihpbml0aWFsQ29sb3IsIGNsaWVudC0+ZWxl bWVudFJlY3RSZWxhdGl2ZVRvUm9vdFZpZXcoKSksIG1fcGFnZS0+cGFnZUlEKCkpOwogfQogCiBX ZWJDb2xvckNob29zZXI6On5XZWJDb2xvckNob29zZXIoKQpAQCAtNzQsNyArNzQsNyBAQCB2b2lk IFdlYkNvbG9yQ2hvb3Nlcjo6c2V0U2VsZWN0ZWRDb2xvcihjCiAgICAgaWYgKCFtX3BhZ2UpCiAg ICAgICAgIHJldHVybjsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3ND b25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0Q29sb3JDaG9vc2Vy Q29sb3IoY29sb3IpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQo KS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6 OlNldENvbG9yUGlja2VyQ29sb3IoY29sb3IpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKIH0KIAogdm9p ZCBXZWJDb2xvckNob29zZXI6OmVuZENob29zZXIoKQpAQCAtODIsNyArODIsNyBAQCB2b2lkIFdl YkNvbG9yQ2hvb3Nlcjo6ZW5kQ2hvb3NlcigpCiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJl dHVybjsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9u KCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RW5kQ29sb3JDaG9vc2VyKCksIG1fcGFn ZS0+cGFnZUlEKCkpOworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25u ZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RW5kQ29sb3JQaWNrZXIoKSwg bV9wYWdlLT5wYWdlSUQoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24g MTUzNTAxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yODQ0LDcgKzI4NDQsNyBAQCB2b2lkIFdlYlBhZ2U6OnNldEFj dGl2ZUNvbG9yQ2hvb3NlcihXZWJDCiAgICAgbV9hY3RpdmVDb2xvckNob29zZXIgPSBjb2xvckNo b29zZXI7CiB9CiAKLXZvaWQgV2ViUGFnZTo6ZGlkRW5kQ29sb3JDaG9vc2VyKCkKK3ZvaWQgV2Vi UGFnZTo6ZGlkRW5kQ29sb3JQaWNrZXIoKQogewogICAgIG1fYWN0aXZlQ29sb3JDaG9vc2VyLT5k aWRFbmRDaG9vc2VyKCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNSw3ICsyMzUsNyBA QCBwdWJsaWM6CiAgICAgV2ViQ29sb3JDaG9vc2VyKiBhY3RpdmVDb2xvckNob29zZXIoKSBjb25z dCB7IHJldHVybiBtX2FjdGl2ZUNvbG9yQ2hvb3NlcjsgfQogICAgIHZvaWQgc2V0QWN0aXZlQ29s b3JDaG9vc2VyKFdlYkNvbG9yQ2hvb3NlciopOwogICAgIHZvaWQgZGlkQ2hvb3NlQ29sb3IoY29u c3QgV2ViQ29yZTo6Q29sb3ImKTsKLSAgICB2b2lkIGRpZEVuZENvbG9yQ2hvb3NlcigpOworICAg IHZvaWQgZGlkRW5kQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCiAgICAgV2ViT3BlblBhbmVsUmVz dWx0TGlzdGVuZXIqIGFjdGl2ZU9wZW5QYW5lbFJlc3VsdExpc3RlbmVyKCkgY29uc3QgeyByZXR1 cm4gbV9hY3RpdmVPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lci5nZXQoKTsgfQpJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMu aW4JKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCw3IEBAIG1l c3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogI2VuZGlmCiAKICNpZiBFTkFCTEUo SU5QVVRfVFlQRV9DT0xPUikKLSAgICBEaWRFbmRDb2xvckNob29zZXIoKQorICAgIERpZEVuZENv bG9yUGlja2VyKCkKICAgICBEaWRDaG9vc2VDb2xvcihXZWJDb3JlOjpDb2xvciBjb2xvcikKICNl bmRpZgogCg== 207787 2013-07-30 17:03:38 -0700 2013-07-30 17:57:16 -0700 Patch bug-119097-20130730170337.patch text/plain 12595 ruthiecftg SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MzUwMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDEzLTA3LTMwICBSdXRoIEZv bmcgIDxydXRoX2ZvbmdAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSA8aW5wdXQgdHlwZT0n Y29sb3InPiBmdW5jdGlvbnMgaW4gV2ViUGFnZVByb3h5LCBXZWJDb2xvclBpY2tlcgorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMTQ1NDk3NzE+IGFuZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE5MDk3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW4gYnVnIDExOTAyNSwgV2ViQ29sb3JDaG9vc2VyUHJveHkgd2FzIHJl bmFtZWQgV2ViQ29sb3JQaWNrZXIuIFRoaXMgcGF0Y2ggbWFrZXMgdGhlIFVJUHJvY2VzcyBjb25z aXN0ZW50CisgICAgICAgIGJ5IHJlbmFtaW5nIFVJUHJvY2VzcyBJTlBVVF9UWVBFX0NPTE9SIGZ1 bmN0aW9ucyBmcm9tIC4uLmNvbG9yQ2hvb3NlciB0byAuLi5jb2xvclBpY2tlci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNv bG9yUGlja2VyOjplbmRQaWNrZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tl ci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb2xvclBpY2tlclJlc3VsdExpc3RlbmVyUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb2xvclBpY2tlclJlc3VsdExpc3RlbmVyUHJv eHk6OnNldENvbG9yKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG93Q29sb3JQaWNrZXIpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldENvbG9yUGlja2VyQ29sb3IpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmVuZENvbG9yUGlja2VyKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRFbmRDb2xvclBpY2tlcik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46 CisgICAgICAgICogVUlQcm9jZXNzL3F0L1dlYkNvbG9yUGlja2VyUXQuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJDb2xvclBpY2tlclF0OjpjcmVhdGVJdGVtKToKKyAgICAgICAgKFdlYktpdDo6 V2ViQ29sb3JQaWNrZXJRdDo6bm90aWZ5Q29sb3JTZWxlY3RlZCk6CisgICAgICAgIChXZWJLaXQ6 OldlYkNvbG9yUGlja2VyUXQ6OmVuZFBpY2tlcik6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1dl YkNvbG9yUGlja2VyUXQuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkNvbG9yQ2hvb3Nlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbG9yQ2hvb3Nlcjo6V2Vi Q29sb3JDaG9vc2VyKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29sb3JDaG9vc2VyOjpzZXRTZWxl Y3RlZENvbG9yKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29sb3JDaG9vc2VyOjplbmRDaG9vc2Vy KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmRpZEVuZENvbG9yUGlja2VyKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl Lm1lc3NhZ2VzLmluOgorCiAyMDEzLTA3LTMwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CiAKICAgICAgICAgU3BlY3VsYXRpdmUgZml4IGZvciBjcmFzaCBkdWUgdG8gc3Ry aW5nIGFjY2VzcyBvbiBtdWx0aXBsZSB0aHJlYWRzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29sb3JQaWNrZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJDb2xvclBpY2tlci5jcHAJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb2xvclBpY2tlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5 LDEyICszOSwxMiBAQCBXZWJDb2xvclBpY2tlcjo6fldlYkNvbG9yUGlja2VyKCkKIHsKIH0KIAot dm9pZCBXZWJDb2xvclBpY2tlcjo6ZW5kQ2hvb3NlcigpCit2b2lkIFdlYkNvbG9yUGlja2VyOjpl bmRQaWNrZXIoKQogewogICAgIGlmICghbV9jbGllbnQpCiAgICAgICAgIHJldHVybjsKIAotICAg IG1fY2xpZW50LT5kaWRFbmRDb2xvckNob29zZXIoKTsKKyAgICBtX2NsaWVudC0+ZGlkRW5kQ29s b3JQaWNrZXIoKTsKIH0KIAogdm9pZCBXZWJDb2xvclBpY2tlcjo6c2V0U2VsZWN0ZWRDb2xvcihj b25zdCBXZWJDb3JlOjpDb2xvciYgY29sb3IpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQ29sb3JQaWNrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQ29sb3JQaWNrZXIuaAkocmV2aXNpb24gMTUzNTAxKQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkNvbG9yUGlja2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDcgKzQ3LDcg QEAgcHVibGljOgogCiAgICAgcHVibGljOgogICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hvb3Nl Q29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImKSA9IDA7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBk aWRFbmRDb2xvckNob29zZXIoKSA9IDA7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRFbmRDb2xv clBpY2tlcigpID0gMDsKICAgICB9OwogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViQ29sb3JQ aWNrZXI+IGNyZWF0ZShDbGllbnQqIGNsaWVudCkKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgog CiAgICAgdm9pZCBpbnZhbGlkYXRlKCkgeyBtX2NsaWVudCA9IDA7IH0KIAotICAgIHZpcnR1YWwg dm9pZCBlbmRDaG9vc2VyKCk7CisgICAgdmlydHVhbCB2b2lkIGVuZFBpY2tlcigpOwogICAgIHZp cnR1YWwgdm9pZCBzZXRTZWxlY3RlZENvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7CiAKIHBy b3RlY3RlZDoKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb2xvclBpY2tlclJl c3VsdExpc3RlbmVyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJDb2xvclBpY2tlclJlc3VsdExpc3RlbmVyUHJveHkuY3BwCShyZXZpc2lvbiAxNTM1 MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXJSZXN1bHRMaXN0 ZW5lclByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEsOCArNTEsOCBAQCB2b2lkIFdlYkNv bG9yUGlja2VyUmVzdWx0TGlzdGVuZXJQcm94eTo6CiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAg IHJldHVybjsKIAotICAgIG1fcGFnZS0+c2V0Q29sb3JDaG9vc2VyQ29sb3IoV2ViQ29yZTo6Q29s b3IoY29sb3IpKTsKLSAgICBtX3BhZ2UtPmVuZENvbG9yQ2hvb3NlcigpOworICAgIG1fcGFnZS0+ c2V0Q29sb3JQaWNrZXJDb2xvcihXZWJDb3JlOjpDb2xvcihjb2xvcikpOworICAgIG1fcGFnZS0+ ZW5kQ29sb3JQaWNrZXIoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAkocmV2aXNpb24gMTUzNTAxKQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI5MjYsNyArMjkyNiw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpuZWVkVG91Y2hFdmVu dHMoYm9vbCAKICNlbmRpZgogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi12b2lkIFdl YlBhZ2VQcm94eTo6c2hvd0NvbG9yQ2hvb3Nlcihjb25zdCBXZWJDb3JlOjpDb2xvciYgaW5pdGlh bENvbG9yLCBjb25zdCBJbnRSZWN0JiBlbGVtZW50UmVjdCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojpz aG93Q29sb3JQaWNrZXIoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGluaXRpYWxDb2xvciwgY29uc3Qg SW50UmVjdCYgZWxlbWVudFJlY3QpCiB7CiAgICAgQVNTRVJUKCFtX2NvbG9yUGlja2VyKTsKIApA QCAtMjk0MywyMSArMjk0MywyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvd0NvbG9yQ2hvb3Nl cihjb25zCiAKICAgICBtX2NvbG9yUGlja2VyID0gbV9wYWdlQ2xpZW50LT5jcmVhdGVDb2xvclBp Y2tlcih0aGlzLCBpbml0aWFsQ29sb3IsIGVsZW1lbnRSZWN0KTsKICAgICBpZiAoIW1fY29sb3JQ aWNrZXIpCi0gICAgICAgIGRpZEVuZENvbG9yQ2hvb3NlcigpOworICAgICAgICBkaWRFbmRDb2xv clBpY2tlcigpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6c2V0Q29sb3JDaG9vc2VyQ29sb3Io Y29uc3QgV2ViQ29yZTo6Q29sb3ImIGNvbG9yKQordm9pZCBXZWJQYWdlUHJveHk6OnNldENvbG9y UGlja2VyQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImIGNvbG9yKQogewogICAgIEFTU0VSVCht X2NvbG9yUGlja2VyKTsKIAogICAgIG1fY29sb3JQaWNrZXItPnNldFNlbGVjdGVkQ29sb3IoY29s b3IpOwogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6ZW5kQ29sb3JDaG9vc2VyKCkKK3ZvaWQgV2Vi UGFnZVByb3h5OjplbmRDb2xvclBpY2tlcigpCiB7CiAgICAgQVNTRVJUKG1fY29sb3JQaWNrZXIp OwogCi0gICAgbV9jb2xvclBpY2tlci0+ZW5kQ2hvb3NlcigpOworICAgIG1fY29sb3JQaWNrZXIt PmVuZFBpY2tlcigpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2hvb3NlQ29sb3IoY29u c3QgV2ViQ29yZTo6Q29sb3ImIGNvbG9yKQpAQCAtMjk2OCw3ICsyOTY4LDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZENob29zZUNvbG9yKGNvbnN0IAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNz YWdlczo6V2ViUGFnZTo6RGlkQ2hvb3NlQ29sb3IoY29sb3IpLCBtX3BhZ2VJRCk7CiB9CiAKLXZv aWQgV2ViUGFnZVByb3h5OjpkaWRFbmRDb2xvckNob29zZXIoKQordm9pZCBXZWJQYWdlUHJveHk6 OmRpZEVuZENvbG9yUGlja2VyKCkKIHsKICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmV0 dXJuOwpAQCAtMjk3OCw3ICsyOTc4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEVuZENvbG9y Q2hvb3NlcigpCiAgICAgICAgIG1fY29sb3JQaWNrZXIgPSBudWxscHRyOwogICAgIH0KIAotICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6RGlkRW5kQ29sb3JDaG9vc2VyKCks IG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkRpZEVu ZENvbG9yUGlja2VyKCksIG1fcGFnZUlEKTsKIAogICAgIG1fY29sb3JQaWNrZXJSZXN1bHRMaXN0 ZW5lci0+aW52YWxpZGF0ZSgpOwogICAgIG1fY29sb3JQaWNrZXJSZXN1bHRMaXN0ZW5lciA9IG51 bGxwdHI7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCShyZXZp c2lvbiAxNTM1MDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgJ KHdvcmtpbmcgY29weSkKQEAgLTc0OSw4ICs3NDksOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBwb3N0 TWVzc2FnZVRvSW5qZWN0ZWRCdW5kbGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFtZSwgQVBJT2Jq ZWN0KiBtZXNzYWdlQm9keSk7CiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKLSAgICB2 b2lkIHNldENvbG9yQ2hvb3NlckNvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7Ci0gICAgdm9p ZCBlbmRDb2xvckNob29zZXIoKTsKKyAgICB2b2lkIHNldENvbG9yUGlja2VyQ29sb3IoY29uc3Qg V2ViQ29yZTo6Q29sb3ImKTsKKyAgICB2b2lkIGVuZENvbG9yUGlja2VyKCk7CiAjZW5kaWYKIAog ICAgIGNvbnN0IFdlYkxvYWRlckNsaWVudCYgbG9hZGVyQ2xpZW50KCkgeyByZXR1cm4gbV9sb2Fk ZXJDbGllbnQ7IH0KQEAgLTkwMCw5ICs5MDAsOSBAQCBwcml2YXRlOgogI2VuZGlmCiAKICNpZiBF TkFCTEUoSU5QVVRfVFlQRV9DT0xPUikKLSAgICB2b2lkIHNob3dDb2xvckNob29zZXIoY29uc3Qg V2ViQ29yZTo6Q29sb3ImIGluaXRpYWxDb2xvciwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwor ICAgIHZvaWQgc2hvd0NvbG9yUGlja2VyKGNvbnN0IFdlYkNvcmU6OkNvbG9yJiBpbml0aWFsQ29s b3IsIGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKICAgICB2b2lkIGRpZENob29zZUNvbG9yKGNv bnN0IFdlYkNvcmU6OkNvbG9yJik7Ci0gICAgdm9pZCBkaWRFbmRDb2xvckNob29zZXIoKTsKKyAg ICB2b2lkIGRpZEVuZENvbG9yUGlja2VyKCk7CiAjZW5kaWYKIAogICAgIHZvaWQgZWRpdG9yU3Rh dGVDaGFuZ2VkKGNvbnN0IEVkaXRvclN0YXRlJik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDE1MzUwMSkK KysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4JKHdv cmtpbmcgY29weSkKQEAgLTk1LDkgKzk1LDkgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZVByb3h5IHsK ICNlbmRpZgogCiAjaWYgRU5BQkxFKElOUFVUX1RZUEVfQ09MT1IpCi0gICAgU2hvd0NvbG9yQ2hv b3NlcihXZWJDb3JlOjpDb2xvciBpbml0aWFsQ29sb3IsIFdlYkNvcmU6OkludFJlY3QgZWxlbWVu dFJlY3QpOwotICAgIFNldENvbG9yQ2hvb3NlckNvbG9yKFdlYkNvcmU6OkNvbG9yIGNvbG9yKTsK LSAgICBFbmRDb2xvckNob29zZXIoKTsKKyAgICBTaG93Q29sb3JQaWNrZXIoV2ViQ29yZTo6Q29s b3IgaW5pdGlhbENvbG9yLCBXZWJDb3JlOjpJbnRSZWN0IGVsZW1lbnRSZWN0KTsKKyAgICBTZXRD b2xvclBpY2tlckNvbG9yKFdlYkNvcmU6OkNvbG9yIGNvbG9yKTsKKyAgICBFbmRDb2xvclBpY2tl cigpOwogI2VuZGlmCiAKICAgICAjIFBvbGljeSBtZXNzYWdlcwpJbmRleDogU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1dlYkNvbG9yUGlja2VyUXQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9XZWJDb2xvclBpY2tlclF0LmNwcAkocmV2aXNpb24gMTUz NTAxKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1dlYkNvbG9yUGlja2VyUXQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC05NCw3ICs5NCw3IEBAIHZvaWQgV2ViQ29sb3JQaWNrZXJRdDo6 Y3JlYXRlSXRlbShRT2JqZWMKIAogICAgIC8vIE5lZWRzIHRvIGJlIGVucXVldWUgYmVjYXVzZSBp dCBtaWdodCB0cmlnZ2VyIGRlbGV0aW9uLgogICAgIGNvbm5lY3QoY29udGV4dE9iamVjdCwgU0lH TkFMKGFjY2VwdGVkKFFDb2xvcikpLCBTTE9UKG5vdGlmeUNvbG9yU2VsZWN0ZWQoUUNvbG9yKSks IFF0OjpRdWV1ZWRDb25uZWN0aW9uKTsKLSAgICBjb25uZWN0KGNvbnRleHRPYmplY3QsIFNJR05B TChyZWplY3RlZCgpKSwgU0xPVChlbmRDaG9vc2VyKCkpLCBRdDo6UXVldWVkQ29ubmVjdGlvbik7 CisgICAgY29ubmVjdChjb250ZXh0T2JqZWN0LCBTSUdOQUwocmVqZWN0ZWQoKSksIFNMT1QoZW5k UGlja2VyKCkpLCBRdDo6UXVldWVkQ29ubmVjdGlvbik7CiAKICAgICBRUXVpY2tXZWJWaWV3UHJp dmF0ZTo6Z2V0KG1fd2ViVmlldyktPmFkZEF0dGFjaGVkUHJvcGVydHlUbyhtX2NvbG9yQ2hvb3Nl ci5nZXQoKSk7CiAgICAgbV9jb2xvckNob29zZXItPnNldFBhcmVudEl0ZW0obV93ZWJWaWV3KTsK QEAgLTEzMiwxMCArMTMyLDEwIEBAIHZvaWQgV2ViQ29sb3JQaWNrZXJRdDo6bm90aWZ5Q29sb3JT ZWxlY3QKICAgICBDb2xvciBjb3JlQ29sb3IgPSBtYWtlUkdCKGNvbG9yLnJlZCgpLCBjb2xvci5n cmVlbigpLCBjb2xvci5ibHVlKCkpOwogICAgIG1fY2xpZW50LT5kaWRDaG9vc2VDb2xvcihjb3Jl Q29sb3IpOwogCi0gICAgZW5kQ2hvb3NlcigpOworICAgIGVuZFBpY2tlcigpOwogfQogCi12b2lk IFdlYkNvbG9yUGlja2VyUXQ6OmVuZENob29zZXIoKQordm9pZCBXZWJDb2xvclBpY2tlclF0Ojpl bmRQaWNrZXIoKQogewogICAgIG1fY29sb3JDaG9vc2VyLmNsZWFyKCk7CiAgICAgbV9jb250ZXh0 LmNsZWFyKCk7CkBAIC0xNDMsNyArMTQzLDcgQEAgdm9pZCBXZWJDb2xvclBpY2tlclF0OjplbmRD aG9vc2VyKCkKICAgICBpZiAoIW1fY2xpZW50KQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2Ns aWVudC0+ZGlkRW5kQ29sb3JDaG9vc2VyKCk7CisgICAgbV9jbGllbnQtPmRpZEVuZENvbG9yUGlj a2VyKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1dlYkNvbG9yUGlja2VyUXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29sb3JQaWNrZXJRdC5oCShyZXZpc2lvbiAxNTM1MDEpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvV2ViQ29sb3JQaWNrZXJRdC5oCSh3b3JraW5n IGNvcHkpCkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2Vs ZWN0ZWRDb2xvcihjb25zdCBXZWJDb3JlOjpDb2xvciYpOwogCiBwdWJsaWMgUV9TTE9UUzoKLSAg ICB2aXJ0dWFsIHZvaWQgZW5kQ2hvb3NlcigpOworICAgIHZpcnR1YWwgdm9pZCBlbmRQaWNrZXIo KTsKIAogcHJpdmF0ZSBRX1NMT1RTOgogICAgIHZvaWQgbm90aWZ5Q29sb3JTZWxlY3RlZChjb25z dCBRQ29sb3ImKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViQ29sb3JDaG9vc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNvbG9yQ2hvb3Nlci5jcHAJKHJldmlzaW9uIDE1MzUw MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ29sb3JD aG9vc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNyBAQCBXZWJDb2xvckNob29z ZXI6OldlYkNvbG9yQ2hvb3NlcihXZWJQYWdlCiAgICAgLCBtX3BhZ2UocGFnZSkKIHsKICAgICBt X3BhZ2UtPnNldEFjdGl2ZUNvbG9yQ2hvb3Nlcih0aGlzKTsKLSAgICBXZWJQcm9jZXNzOjpzaGFy ZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJv eHk6OlNob3dDb2xvckNob29zZXIoaW5pdGlhbENvbG9yLCBjbGllbnQtPmVsZW1lbnRSZWN0UmVs YXRpdmVUb1Jvb3RWaWV3KCkpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICBXZWJQcm9jZXNzOjpz aGFyZWQoKS5wYXJlbnRQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OlNob3dDb2xvclBpY2tlcihpbml0aWFsQ29sb3IsIGNsaWVudC0+ZWxlbWVudFJlY3RS ZWxhdGl2ZVRvUm9vdFZpZXcoKSksIG1fcGFnZS0+cGFnZUlEKCkpOwogfQogCiBXZWJDb2xvckNo b29zZXI6On5XZWJDb2xvckNob29zZXIoKQpAQCAtNzQsNyArNzQsNyBAQCB2b2lkIFdlYkNvbG9y Q2hvb3Nlcjo6c2V0U2VsZWN0ZWRDb2xvcihjCiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJl dHVybjsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9u KCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0Q29sb3JDaG9vc2VyQ29sb3IoY29s b3IpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5wYXJlbnRQ cm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNldENvbG9y UGlja2VyQ29sb3IoY29sb3IpLCBtX3BhZ2UtPnBhZ2VJRCgpKTsKIH0KIAogdm9pZCBXZWJDb2xv ckNob29zZXI6OmVuZENob29zZXIoKQpAQCAtODIsNyArODIsNyBAQCB2b2lkIFdlYkNvbG9yQ2hv b3Nlcjo6ZW5kQ2hvb3NlcigpCiAgICAgaWYgKCFtX3BhZ2UpCiAgICAgICAgIHJldHVybjsKIAot ICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RW5kQ29sb3JDaG9vc2VyKCksIG1fcGFnZS0+cGFnZUlE KCkpOworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnBhcmVudFByb2Nlc3NDb25uZWN0aW9uKCkt PnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RW5kQ29sb3JQaWNrZXIoKSwgbV9wYWdlLT5w YWdlSUQoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAkocmV2aXNpb24gMTUzNTAxKQor KysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0yODQ0LDcgKzI4NDQsNyBAQCB2b2lkIFdlYlBhZ2U6OnNldEFjdGl2ZUNvbG9y Q2hvb3NlcihXZWJDCiAgICAgbV9hY3RpdmVDb2xvckNob29zZXIgPSBjb2xvckNob29zZXI7CiB9 CiAKLXZvaWQgV2ViUGFnZTo6ZGlkRW5kQ29sb3JDaG9vc2VyKCkKK3ZvaWQgV2ViUGFnZTo6ZGlk RW5kQ29sb3JQaWNrZXIoKQogewogICAgIG1fYWN0aXZlQ29sb3JDaG9vc2VyLT5kaWRFbmRDaG9v c2VyKCk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmgJKHJldmlzaW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNSw3ICsyMzUsNyBAQCBwdWJsaWM6 CiAgICAgV2ViQ29sb3JDaG9vc2VyKiBhY3RpdmVDb2xvckNob29zZXIoKSBjb25zdCB7IHJldHVy biBtX2FjdGl2ZUNvbG9yQ2hvb3NlcjsgfQogICAgIHZvaWQgc2V0QWN0aXZlQ29sb3JDaG9vc2Vy KFdlYkNvbG9yQ2hvb3NlciopOwogICAgIHZvaWQgZGlkQ2hvb3NlQ29sb3IoY29uc3QgV2ViQ29y ZTo6Q29sb3ImKTsKLSAgICB2b2lkIGRpZEVuZENvbG9yQ2hvb3NlcigpOworICAgIHZvaWQgZGlk RW5kQ29sb3JQaWNrZXIoKTsKICNlbmRpZgogCiAgICAgV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVu ZXIqIGFjdGl2ZU9wZW5QYW5lbFJlc3VsdExpc3RlbmVyKCkgY29uc3QgeyByZXR1cm4gbV9hY3Rp dmVPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lci5nZXQoKTsgfQpJbmRleDogU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4JKHJldmlz aW9uIDE1MzUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl Lm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC00OCw3ICs0OCw3IEBAIG1lc3NhZ2VzIC0+ IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewogI2VuZGlmCiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQ RV9DT0xPUikKLSAgICBEaWRFbmRDb2xvckNob29zZXIoKQorICAgIERpZEVuZENvbG9yUGlja2Vy KCkKICAgICBEaWRDaG9vc2VDb2xvcihXZWJDb3JlOjpDb2xvciBjb2xvcikKICNlbmRpZgogCg==