132452 2014-05-01 17:43:12 -0700 Update service picker API usage 2014-05-01 20:32:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson commit-queue thorton oldest_to_newest 1005921 0 beidson 2014-05-01 17:43:12 -0700 Update service picker API usage <rdar://problem/16772674> 1005922 1 230635 beidson 2014-05-01 17:47:54 -0700 Created attachment 230635 Patch v1 1005925 2 commit-queue 2014-05-01 17:49:08 -0700 Attachment 230635 did not pass style-queue: ERROR: Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:171: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1005930 3 230635 thorton 2014-05-01 18:08:17 -0700 Comment on attachment 230635 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=230635&action=review > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:113 > + data = [nsImage.get() TIFFRepresentation]; no .get() > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:166 > + [self didShareImageData :[item TIFFRepresentation] confirmDataIsValidTIFFData:NO]; colon is in way the wrong place > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:169 > + NSString *itemUTI = itemProvider.registeredTypeIdentifiers.firstObject; firstObject is not available on ML IIRC > Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm:370 > + RetainPtr<CFDataRef> cfdata = data->createCFData(); capital D 1005931 4 thorton 2014-05-01 18:08:40 -0700 (In reply to comment #3) > (From update of attachment 230635 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=230635&action=review > > > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:113 > > + data = [nsImage.get() TIFFRepresentation]; > > no .get() > > > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:166 > > + [self didShareImageData :[item TIFFRepresentation] confirmDataIsValidTIFFData:NO]; > > colon is in way the wrong place > > > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:169 > > + NSString *itemUTI = itemProvider.registeredTypeIdentifiers.firstObject; > > firstObject is not available on ML IIRC Neither is this code, never mind. > > Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm:370 > > + RetainPtr<CFDataRef> cfdata = data->createCFData(); > > capital D 1005959 5 230646 beidson 2014-05-01 19:55:34 -0700 Created attachment 230646 Patch for landing 1005960 6 commit-queue 2014-05-01 19:56:11 -0700 Attachment 230646 did not pass style-queue: ERROR: Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:171: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1005965 7 230646 commit-queue 2014-05-01 20:32:11 -0700 Comment on attachment 230646 Patch for landing Clearing flags on attachment: 230646 Committed r168145: <http://trac.webkit.org/changeset/168145> 1005966 8 commit-queue 2014-05-01 20:32:13 -0700 All reviewed patches have been landed. Closing bug. 230635 2014-05-01 17:47:54 -0700 2014-05-01 19:55:34 -0700 Patch v1 patch text/plain 8848 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCBhNDgxZGRjLi4zMDllZjRjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTQtMDUtMDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFVwZGF0ZSBzZXJ2aWNlIHBpY2tlciBBUEkgdXNhZ2UuCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xNjc3MjY3ND4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzI0NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIE1pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLmg6 CisgICAgICAgICogTWlzYy9XZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIubW06Cisg ICAgICAgICgtW1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlciBkaWRTaGFyZUltYWdl RGF0YTpjb25maXJtRGF0YUlzVmFsaWRUSUZGRGF0YTpdKToKKyAgICAgICAgICBGYWN0b3Igb3V0 IGEgY29tbW9uICJkaWRTaGFyZSIgaGFuZGxlciB0aGF0IG9wdGlvbmFsbHkgdmFsaWRhdGVzIHdo ZXRoZXIgdGhlIGRhdGEgcmVwcmVzZW50cyBhbiBpbWFnZS4KKyAgICAgICAgKC1bV2ViU2hhcmlu Z1NlcnZpY2VQaWNrZXJDb250cm9sbGVyIHNoYXJpbmdTZXJ2aWNlOmRpZFNoYXJlSXRlbXM6XSk6 IFVwZGF0ZSBBUEkgdXNhZ2UsIGluY2x1ZGluZyBtYXJzaGFsbGluZworICAgICAgICAgIG9uIG9m Zi1tYWluIHRocmVhZCBjYWxsIGJhY2sgdG8gdGhlIG1haW4gdGhyZWFkLgorCisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQubW06CisgICAgICAgIChXZWJDb250 ZXh0TWVudUNsaWVudDo6Y29udGV4dE1lbnVGb3JFdmVudCk6IFVwZGF0ZSBBUEkgdXNhZ2UuCisK IDIwMTQtMDQtMzAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIEVOQUJMRV9QTFVHSU5fUFJPWFlfRk9SX1ZJREVPCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlci5o IGIvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xs ZXIuaAppbmRleCBiNmZlNjI4Li5kY2IxOTdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21h Yy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvbWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLmgKQEAgLTM5 LDggKzM5LDkgQEAgY2xhc3MgV2ViQ29udGV4dE1lbnVDbGllbnQ7CiAgICAgQk9PTCBfaW5jbHVk ZUVkaXRvclNlcnZpY2VzOwogfQogCi0tIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhJbWFnZTooTlNJ bWFnZSAqKWltYWdlIGluY2x1ZGVFZGl0b3JTZXJ2aWNlczooQk9PTClpbmNsdWRlRWRpdG9yU2Vy dmljZXMgbWVudUNsaWVudDooV2ViQ29udGV4dE1lbnVDbGllbnQqKW1lbnVDbGllbnQ7CistIChp bnN0YW5jZXR5cGUpaW5pdFdpdGhEYXRhOihOU0RhdGEgKilkYXRhIGluY2x1ZGVFZGl0b3JTZXJ2 aWNlczooQk9PTClpbmNsdWRlRWRpdG9yU2VydmljZXMgbWVudUNsaWVudDooV2ViQ29udGV4dE1l bnVDbGllbnQqKW1lbnVDbGllbnQ7CiAtIChOU01lbnUgKiltZW51OworLSAodm9pZClkaWRTaGFy ZUltYWdlRGF0YTooTlNEYXRhICopZGF0YSBjb25maXJtRGF0YUlzVmFsaWRUSUZGRGF0YTooQk9P TCljb25maXJtRGF0YTsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9N aXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlci5tbSBiL1NvdXJjZS9XZWJLaXQv bWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tCmluZGV4IGI4NWQ2 NTYuLjE1ODgwOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViU2hhcmlu Z1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL01pc2Mv V2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tCkBAIC00OSw3ICs0OSwxNiBAQCBA aW50ZXJmYWNlIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXIgKFByaXZhdGUpCiBAcHJvcGVydHkgTlNT aGFyaW5nU2VydmljZVBpY2tlclN0eWxlIHN0eWxlOwogLSAoTlNNZW51ICopbWVudTsKIEBlbmQK KyNlbmRpZgogCisjaWYgX19oYXNfaW5jbHVkZSg8QXBwS2l0L05TSXRlbVByb3ZpZGVyLmg+KQor I2ltcG9ydCA8QXBwS2l0L05TSXRlbVByb3ZpZGVyLmg+CisjZWxzZQorQGludGVyZmFjZSBOU0l0 ZW1Qcm92aWRlciA6IE5TT2JqZWN0CitAcHJvcGVydHkgKGNvcHksIHJlYWRvbmx5KSBOU0FycmF5 ICpyZWdpc3RlcmVkVHlwZUlkZW50aWZpZXJzOworLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoSXRl bTooaWQgPE5TU2VjdXJlQ29kaW5nPilpdGVtIHR5cGVJZGVudGlmaWVyOihOU1N0cmluZyAqKXR5 cGVJZGVudGlmaWVyOworLSAodm9pZClsb2FkSXRlbUZvclR5cGVJZGVudGlmaWVyOihOU1N0cmlu ZyAqKXR5cGVJZGVudGlmaWVyIG9wdGlvbnM6KE5TRGljdGlvbmFyeSAqKW9wdGlvbnMgY29tcGxl dGlvbkhhbmRsZXI6KHZvaWQgKF4pKGlkIDxOU1NlY3VyZUNvZGluZz4gaXRlbSwgTlNFcnJvciAq ZXJyb3IpKWNvbXBsZXRpb25IYW5kbGVyOworQGVuZAogI2VuZGlmCiAKIHN0YXRpYyBOU1N0cmlu ZyAqc2VydmljZUNvbnRyb2xzUGFzdGVib2FyZE5hbWUgPSBAIldlYktpdFNlcnZpY2VDb250cm9s c1Bhc3RlYm9hcmQiOwpAQCAtNTgsMTIgKzY3LDE0IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCiBAaW1wbGVtZW50YXRpb24gV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyCiAK LS0gKGluc3RhbmNldHlwZSlpbml0V2l0aEltYWdlOihOU0ltYWdlICopaW1hZ2UgaW5jbHVkZUVk aXRvclNlcnZpY2VzOihCT09MKWluY2x1ZGVFZGl0b3JTZXJ2aWNlcyBtZW51Q2xpZW50OihXZWJD b250ZXh0TWVudUNsaWVudCopbWVudUNsaWVudAorLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRGF0 YTooTlNEYXRhICopZGF0YSBpbmNsdWRlRWRpdG9yU2VydmljZXM6KEJPT0wpaW5jbHVkZUVkaXRv clNlcnZpY2VzIG1lbnVDbGllbnQ6KFdlYkNvbnRleHRNZW51Q2xpZW50KiltZW51Q2xpZW50CiB7 CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJldHVybiBuaWw7CiAK LSAgICBfcGlja2VyID0gYWRvcHROUyhbW05TU2hhcmluZ1NlcnZpY2VQaWNrZXIgYWxsb2NdIGlu aXRXaXRoSXRlbXM6QFsgaW1hZ2UgXV0pOworICAgIFJldGFpblB0cjxOU0l0ZW1Qcm92aWRlcj4g aXRlbVByb3ZpZGVyID0gYWRvcHROUyhbW05TSXRlbVByb3ZpZGVyIGFsbG9jXSBpbml0V2l0aEl0 ZW06ZGF0YSB0eXBlSWRlbnRpZmllcjpAInB1YmxpYy5kYXRhIl0pOworCisgICAgX3BpY2tlciA9 IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0ZW1zOkBb IGl0ZW1Qcm92aWRlci5nZXQoKSBdXSk7CiAgICAgW19waWNrZXIgc2V0U3R5bGU6TlNTaGFyaW5n U2VydmljZVBpY2tlclN0eWxlUm9sbG92ZXJdOwogICAgIFtfcGlja2VyIHNldERlbGVnYXRlOnNl bGZdOwogCkBAIC04Niw4ICs5NywzNCBAQCAtIChOU01lbnUgKiltZW51CiAgICAgcmV0dXJuIFtf cGlja2VyIG1lbnVdOwogfQogCi0jcHJhZ21hIG1hcmsgTlNTaGFyaW5nU2VydmljZVBpY2tlckRl bGVnYXRlIG1ldGhvZHMKKy0gKHZvaWQpZGlkU2hhcmVJbWFnZURhdGE6KE5TRGF0YSAqKWRhdGEg Y29uZmlybURhdGFJc1ZhbGlkVElGRkRhdGE6KEJPT0wpY29uZmlybURhdGEKK3sKKyAgICBQYWdl KiBwYWdlID0gW19tZW51Q2xpZW50LT53ZWJWaWV3KCkgcGFnZV07CisgICAgaWYgKCFwYWdlKQor ICAgICAgICByZXR1cm47CisKKyAgICBpZiAoY29uZmlybURhdGEpIHsKKyAgICAgICAgUmV0YWlu UHRyPE5TSW1hZ2U+IG5zSW1hZ2UgPSBhZG9wdE5TKFtbTlNJbWFnZSBhbGxvY10gaW5pdFdpdGhE YXRhOmRhdGFdKTsKKyAgICAgICAgaWYgKCFuc0ltYWdlKSB7CisgICAgICAgICAgICBMT0dfRVJS T1IoIlNoYXJlZCBpbWFnZSBkYXRhIGNhbm5vdCBjcmVhdGUgYSB2YWxpZCBOU0ltYWdlIik7Cisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBkYXRhID0gW25zSW1hZ2Uu Z2V0KCkgVElGRlJlcHJlc2VudGF0aW9uXTsKKyAgICB9CisKKyAgICBOU1Bhc3RlYm9hcmQgKnBh c3RlYm9hcmQgPSBbTlNQYXN0ZWJvYXJkIHBhc3RlYm9hcmRXaXRoTmFtZTpzZXJ2aWNlQ29udHJv bHNQYXN0ZWJvYXJkTmFtZV07CisgICAgW3Bhc3RlYm9hcmQgZGVjbGFyZVR5cGVzOkBbIE5TUGFz dGVib2FyZFR5cGVUSUZGIF0gb3duZXI6bmlsXTsKKyAgICBbcGFzdGVib2FyZCBzZXREYXRhOmRh dGEgZm9yVHlwZTpOU1Bhc3RlYm9hcmRUeXBlVElGRl07CisKKyAgICBGcmFtZSYgZnJhbWUgPSBw YWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKTsKKyAgICBpZiAoIWZy YW1lLnNlbGVjdGlvbigpLmlzTm9uZSgpKQorICAgICAgICBmcmFtZS5lZGl0b3IoKS5yZWFkU2Vs ZWN0aW9uRnJvbVBhc3RlYm9hcmQoc2VydmljZUNvbnRyb2xzUGFzdGVib2FyZE5hbWUpOwogCisg ICAgW3NlbGYgY2xlYXJdOworfQorCisjcHJhZ21hIG1hcmsgTlNTaGFyaW5nU2VydmljZVBpY2tl ckRlbGVnYXRlIG1ldGhvZHMKIAogLSAoTlNBcnJheSAqKXNoYXJpbmdTZXJ2aWNlUGlja2VyOihO U1NoYXJpbmdTZXJ2aWNlUGlja2VyICopc2hhcmluZ1NlcnZpY2VQaWNrZXIgc2hhcmluZ1NlcnZp Y2VzRm9ySXRlbXM6KE5TQXJyYXkgKilpdGVtcyBtYXNrOihOU1NoYXJpbmdTZXJ2aWNlTWFzaylt YXNrIHByb3Bvc2VkU2hhcmluZ1NlcnZpY2VzOihOU0FycmF5ICopcHJvcG9zZWRTZXJ2aWNlcwog ewpAQCAtMTIzLDI1ICsxNjAsMzIgQEAgLSAodm9pZClzaGFyaW5nU2VydmljZTooTlNTaGFyaW5n U2VydmljZSAqKXNoYXJpbmdTZXJ2aWNlIGRpZFNoYXJlSXRlbXM6KE5TQXJyYXkKICAgICBpZiAo W2l0ZW1zIGNvdW50XSAhPSAxKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZXRhaW5QdHI8Q0dJ bWFnZVNvdXJjZVJlZj4gc291cmNlID0gYWRvcHRDRihDR0ltYWdlU291cmNlQ3JlYXRlV2l0aERh dGEoKENGRGF0YVJlZilbaXRlbXMgb2JqZWN0QXRJbmRleDowXSwgTlVMTCkpOwotICAgIFJldGFp blB0cjxDR0ltYWdlUmVmPiBjZ0ltYWdlID0gYWRvcHRDRihDR0ltYWdlU291cmNlQ3JlYXRlSW1h Z2VBdEluZGV4KHNvdXJjZS5nZXQoKSwgMCwgTlVMTCkpOwotCi0gICAgaWYgKCFjZ0ltYWdlKQot ICAgICAgICByZXR1cm47Ci0KLSAgICBQYWdlKiBwYWdlID0gW19tZW51Q2xpZW50LT53ZWJWaWV3 KCkgcGFnZV07Ci0gICAgaWYgKCFwYWdlKQotICAgICAgICByZXR1cm47CisgICAgaWQgaXRlbSA9 IFtpdGVtcyBvYmplY3RBdEluZGV4OjBdOwogCi0gICAgTlNQYXN0ZWJvYXJkICpwYXN0ZWJvYXJk ID0gW05TUGFzdGVib2FyZCBwYXN0ZWJvYXJkV2l0aE5hbWU6c2VydmljZUNvbnRyb2xzUGFzdGVi b2FyZE5hbWVdOwotICAgIFtwYXN0ZWJvYXJkIGRlY2xhcmVUeXBlczpAWyBOU1Bhc3RlYm9hcmRU eXBlVElGRiBdIG93bmVyOm5pbF07Ci0gICAgW3Bhc3RlYm9hcmQgc2V0RGF0YTpbaXRlbXMgb2Jq ZWN0QXRJbmRleDowXSBmb3JUeXBlOk5TUGFzdGVib2FyZFR5cGVUSUZGXTsKLQotICAgIEZyYW1l JiBmcmFtZSA9IHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwot ICAgIGlmICghZnJhbWUuc2VsZWN0aW9uKCkuaXNOb25lKCkpCi0gICAgICAgIGZyYW1lLmVkaXRv cigpLnJlYWRTZWxlY3Rpb25Gcm9tUGFzdGVib2FyZChzZXJ2aWNlQ29udHJvbHNQYXN0ZWJvYXJk TmFtZSk7Ci0KLSAgICBbc2VsZiBjbGVhcl07CisgICAgaWYgKFtpdGVtIGlzS2luZE9mQ2xhc3M6 W05TSW1hZ2UgY2xhc3NdXSkKKyAgICAgICAgW3NlbGYgZGlkU2hhcmVJbWFnZURhdGEgOltpdGVt IFRJRkZSZXByZXNlbnRhdGlvbl0gY29uZmlybURhdGFJc1ZhbGlkVElGRkRhdGE6Tk9dOworICAg IGVsc2UgaWYgKFtpdGVtIGlzS2luZE9mQ2xhc3M6W05TSXRlbVByb3ZpZGVyIGNsYXNzXV0pIHsK KyAgICAgICAgTlNJdGVtUHJvdmlkZXIgKml0ZW1Qcm92aWRlciA9IChOU0l0ZW1Qcm92aWRlciAq KWl0ZW07CisgICAgICAgIE5TU3RyaW5nICppdGVtVVRJID0gaXRlbVByb3ZpZGVyLnJlZ2lzdGVy ZWRUeXBlSWRlbnRpZmllcnMuZmlyc3RPYmplY3Q7CisgICAgICAgIAorICAgICAgICBbaXRlbVBy b3ZpZGVyIGxvYWRJdGVtRm9yVHlwZUlkZW50aWZpZXI6aXRlbVVUSSBvcHRpb25zOm5pbCBjb21w bGV0aW9uSGFuZGxlcjpeKGlkIHJlY2VpdmVkRGF0YSwgTlNFcnJvciAqZGF0YUVycm9yKSB7Cisg ICAgICAgICAgICBpZiAoIXJlY2VpdmVkRGF0YSkgeworICAgICAgICAgICAgICAgIExPR19FUlJP UigiRGlkIG5vdCByZWNlaXZlIGRhdGEgZnJvbSBOU0l0ZW1Qcm92aWRlciIpOworICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKCFbcmVjZWl2 ZWREYXRhIGlzS2luZE9mQ2xhc3M6W05TRGF0YSBjbGFzc11dKSB7CisgICAgICAgICAgICAgICAg TE9HX0VSUk9SKCJEYXRhIHJlY2VpdmVkIGZyb20gTlNJdGVtUHJvdmlkZXIgaXMgbm90IG9mIHR5 cGUgTlNEYXRhIik7CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisg ICAgICAgICAgICBbW05TT3BlcmF0aW9uUXVldWUgbWFpblF1ZXVlXSBhZGRPcGVyYXRpb25XaXRo QmxvY2s6XnsKKyAgICAgICAgICAgICAgICBbc2VsZiBkaWRTaGFyZUltYWdlRGF0YTpyZWNlaXZl ZERhdGEgY29uZmlybURhdGFJc1ZhbGlkVElGRkRhdGE6WUVTXTsKKyAgICAgICAgICAgIH1dOwor CisgICAgICAgIH1dOworICAgIH0gZWxzZQorICAgICAgICBMT0dfRVJST1IoInNoYXJpbmdTZXJ2 aWNlOmRpZFNoYXJlSXRlbXM6IC0gVW5rbm93biBpdGVtIHR5cGUgcmV0dXJuZWQiKTsKIH0KIAog LSAodm9pZClzaGFyaW5nU2VydmljZTooTlNTaGFyaW5nU2VydmljZSAqKXNoYXJpbmdTZXJ2aWNl IGRpZEZhaWxUb1NoYXJlSXRlbXM6KE5TQXJyYXkgKilpdGVtcyBlcnJvcjooTlNFcnJvciAqKWVy cm9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250 ZXh0TWVudUNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNv bnRleHRNZW51Q2xpZW50Lm1tCmluZGV4IDRjZDkzMGMuLmI1YTZiN2YgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50 Lm1tCkBAIC01MCw2ICs1MCw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL1VSTC5oPgogI2ltcG9ydCA8 V2ViQ29yZS9Mb2NhbGl6ZWRTdHJpbmdzLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BhZ2UuaD4KKyNp bXBvcnQgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lLmg+ CiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lVmlldy5oPgogI2ltcG9ydCA8V2ViQ29yZS9SdW50aW1l QXBwbGljYXRpb25DaGVja3MuaD4KQEAgLTM2Myw4ICszNjQsMTMgQEAgTlNNZW51ICpXZWJDb250 ZXh0TWVudUNsaWVudDo6Y29udGV4dE1lbnVGb3JFdmVudChOU0V2ZW50ICpldmVudCwgTlNWaWV3 ICp2aWV3KQogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIGlmIChJbWFnZSogaW1h Z2UgPSBwYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS5jb250ZXh0KCkuY29udHJvbGxlZElt YWdlKCkpIHsKICAgICAgICAgQVNTRVJUKHBhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLmNv bnRleHQoKS5oaXRUZXN0UmVzdWx0KCkuaW5uZXJOb2RlKCkpOworCisgICAgICAgIFJlZlB0cjxT aGFyZWRCdWZmZXI+IGRhdGEgPSBpbWFnZS0+ZGF0YSgpOworICAgICAgICBBU1NFUlQoZGF0YSk7 CisgICAgICAgIFJldGFpblB0cjxDRkRhdGFSZWY+IGNmZGF0YSA9IGRhdGEtPmNyZWF0ZUNGRGF0 YSgpOworCiAgICAgICAgIGJvb2wgaXNDb250ZW50RWRpdGFibGUgPSBwYWdlLT5jb250ZXh0TWVu dUNvbnRyb2xsZXIoKS5jb250ZXh0KCkuaGl0VGVzdFJlc3VsdCgpLmlubmVyTm9kZSgpLT5pc0Nv bnRlbnRFZGl0YWJsZSgpOwotICAgICAgICBtX3NoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxl ciA9IGFkb3B0TlMoW1tXZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIgYWxsb2NdIGlu aXRXaXRoSW1hZ2U6aW1hZ2UtPmdldE5TSW1hZ2UoKSBpbmNsdWRlRWRpdG9yU2VydmljZXM6aXND b250ZW50RWRpdGFibGUgbWVudUNsaWVudDp0aGlzXSk7CisgICAgICAgIG1fc2hhcmluZ1NlcnZp Y2VQaWNrZXJDb250cm9sbGVyID0gYWRvcHROUyhbW1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29u dHJvbGxlciBhbGxvY10gaW5pdFdpdGhEYXRhOihOU0RhdGEgKiljZmRhdGEuZ2V0KCkgaW5jbHVk ZUVkaXRvclNlcnZpY2VzOmlzQ29udGVudEVkaXRhYmxlIG1lbnVDbGllbnQ6dGhpc10pOwogICAg ICAgICAKICAgICAgICAgcmV0dXJuIFttX3NoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlciBt ZW51XTsKICAgICB9Cg== 230646 2014-05-01 19:55:34 -0700 2014-05-01 20:32:11 -0700 Patch for landing patch text/plain 8837 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCBhNDgxZGRjLi43MDIzMTNiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjAgQEAKKzIwMTQtMDUtMDEgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFVwZGF0ZSBzZXJ2aWNlIHBpY2tlciBBUEkgdXNhZ2UuCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8xNjc3MjY3ND4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzI0NTIKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgor CisgICAgICAgICogTWlzYy9XZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIuaDoKKyAg ICAgICAgKiBNaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlci5tbToKKyAgICAg ICAgKC1bV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyIGRpZFNoYXJlSW1hZ2VEYXRh OmNvbmZpcm1EYXRhSXNWYWxpZFRJRkZEYXRhOl0pOgorICAgICAgICAgIEZhY3RvciBvdXQgYSBj b21tb24gImRpZFNoYXJlIiBoYW5kbGVyIHRoYXQgb3B0aW9uYWxseSB2YWxpZGF0ZXMgd2hldGhl ciB0aGUgZGF0YSByZXByZXNlbnRzIGFuIGltYWdlLgorICAgICAgICAoLVtXZWJTaGFyaW5nU2Vy dmljZVBpY2tlckNvbnRyb2xsZXIgc2hhcmluZ1NlcnZpY2U6ZGlkU2hhcmVJdGVtczpdKTogVXBk YXRlIEFQSSB1c2FnZSwgaW5jbHVkaW5nIG1hcnNoYWxsaW5nCisgICAgICAgICAgb24gb2ZmLW1h aW4gdGhyZWFkIGNhbGwgYmFjayB0byB0aGUgbWFpbiB0aHJlYWQuCisKKyAgICAgICAgKiBXZWJD b3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbToKKyAgICAgICAgKFdlYkNvbnRleHRN ZW51Q2xpZW50Ojpjb250ZXh0TWVudUZvckV2ZW50KTogVXBkYXRlIEFQSSB1c2FnZS4KKwogMjAx NC0wNC0zMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZW1vdmUgRU5BQkxFX1BMVUdJTl9QUk9YWV9GT1JfVklERU8KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvbWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLmggYi9T b3VyY2UvV2ViS2l0L21hYy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlci5o CmluZGV4IGI2ZmU2MjguLmRjYjE5N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL01p c2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktp dC9tYWMvTWlzYy9XZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIuaApAQCAtMzksOCAr MzksOSBAQCBjbGFzcyBXZWJDb250ZXh0TWVudUNsaWVudDsKICAgICBCT09MIF9pbmNsdWRlRWRp dG9yU2VydmljZXM7CiB9CiAKLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aEltYWdlOihOU0ltYWdl ICopaW1hZ2UgaW5jbHVkZUVkaXRvclNlcnZpY2VzOihCT09MKWluY2x1ZGVFZGl0b3JTZXJ2aWNl cyBtZW51Q2xpZW50OihXZWJDb250ZXh0TWVudUNsaWVudCopbWVudUNsaWVudDsKKy0gKGluc3Rh bmNldHlwZSlpbml0V2l0aERhdGE6KE5TRGF0YSAqKWRhdGEgaW5jbHVkZUVkaXRvclNlcnZpY2Vz OihCT09MKWluY2x1ZGVFZGl0b3JTZXJ2aWNlcyBtZW51Q2xpZW50OihXZWJDb250ZXh0TWVudUNs aWVudCopbWVudUNsaWVudDsKIC0gKE5TTWVudSAqKW1lbnU7CistICh2b2lkKWRpZFNoYXJlSW1h Z2VEYXRhOihOU0RhdGEgKilkYXRhIGNvbmZpcm1EYXRhSXNWYWxpZFRJRkZEYXRhOihCT09MKWNv bmZpcm1EYXRhOwogCiBAZW5kCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2Mv V2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdC9tYWMv TWlzYy9XZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIubW0KaW5kZXggYjg1ZDY1Ni4u NzQ4YzM3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJTaGFyaW5nU2Vy dmljZVBpY2tlckNvbnRyb2xsZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvTWlzYy9XZWJT aGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIubW0KQEAgLTQ5LDcgKzQ5LDE2IEBAIEBpbnRl cmZhY2UgTlNTaGFyaW5nU2VydmljZVBpY2tlciAoUHJpdmF0ZSkKIEBwcm9wZXJ0eSBOU1NoYXJp bmdTZXJ2aWNlUGlja2VyU3R5bGUgc3R5bGU7CiAtIChOU01lbnUgKiltZW51OwogQGVuZAorI2Vu ZGlmCiAKKyNpZiBfX2hhc19pbmNsdWRlKDxBcHBLaXQvTlNJdGVtUHJvdmlkZXIuaD4pCisjaW1w b3J0IDxBcHBLaXQvTlNJdGVtUHJvdmlkZXIuaD4KKyNlbHNlCitAaW50ZXJmYWNlIE5TSXRlbVBy b3ZpZGVyIDogTlNPYmplY3QKK0Bwcm9wZXJ0eSAoY29weSwgcmVhZG9ubHkpIE5TQXJyYXkgKnJl Z2lzdGVyZWRUeXBlSWRlbnRpZmllcnM7CistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhJdGVtOihp ZCA8TlNTZWN1cmVDb2Rpbmc+KWl0ZW0gdHlwZUlkZW50aWZpZXI6KE5TU3RyaW5nICopdHlwZUlk ZW50aWZpZXI7CistICh2b2lkKWxvYWRJdGVtRm9yVHlwZUlkZW50aWZpZXI6KE5TU3RyaW5nICop dHlwZUlkZW50aWZpZXIgb3B0aW9uczooTlNEaWN0aW9uYXJ5ICopb3B0aW9ucyBjb21wbGV0aW9u SGFuZGxlcjoodm9pZCAoXikoaWQgPE5TU2VjdXJlQ29kaW5nPiBpdGVtLCBOU0Vycm9yICplcnJv cikpY29tcGxldGlvbkhhbmRsZXI7CitAZW5kCiAjZW5kaWYKIAogc3RhdGljIE5TU3RyaW5nICpz ZXJ2aWNlQ29udHJvbHNQYXN0ZWJvYXJkTmFtZSA9IEAiV2ViS2l0U2VydmljZUNvbnRyb2xzUGFz dGVib2FyZCI7CkBAIC01OCwxMiArNjcsMTQgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAK IEBpbXBsZW1lbnRhdGlvbiBXZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIKIAotLSAo aW5zdGFuY2V0eXBlKWluaXRXaXRoSW1hZ2U6KE5TSW1hZ2UgKilpbWFnZSBpbmNsdWRlRWRpdG9y U2VydmljZXM6KEJPT0wpaW5jbHVkZUVkaXRvclNlcnZpY2VzIG1lbnVDbGllbnQ6KFdlYkNvbnRl eHRNZW51Q2xpZW50KiltZW51Q2xpZW50CistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhEYXRhOihO U0RhdGEgKilkYXRhIGluY2x1ZGVFZGl0b3JTZXJ2aWNlczooQk9PTClpbmNsdWRlRWRpdG9yU2Vy dmljZXMgbWVudUNsaWVudDooV2ViQ29udGV4dE1lbnVDbGllbnQqKW1lbnVDbGllbnQKIHsKICAg ICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAotICAg IF9waWNrZXIgPSBhZG9wdE5TKFtbTlNTaGFyaW5nU2VydmljZVBpY2tlciBhbGxvY10gaW5pdFdp dGhJdGVtczpAWyBpbWFnZSBdXSk7CisgICAgUmV0YWluUHRyPE5TSXRlbVByb3ZpZGVyPiBpdGVt UHJvdmlkZXIgPSBhZG9wdE5TKFtbTlNJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRXaXRoSXRlbTpk YXRhIHR5cGVJZGVudGlmaWVyOkAicHVibGljLmRhdGEiXSk7CisKKyAgICBfcGlja2VyID0gYWRv cHROUyhbW05TU2hhcmluZ1NlcnZpY2VQaWNrZXIgYWxsb2NdIGluaXRXaXRoSXRlbXM6QFsgaXRl bVByb3ZpZGVyLmdldCgpIF1dKTsKICAgICBbX3BpY2tlciBzZXRTdHlsZTpOU1NoYXJpbmdTZXJ2 aWNlUGlja2VyU3R5bGVSb2xsb3Zlcl07CiAgICAgW19waWNrZXIgc2V0RGVsZWdhdGU6c2VsZl07 CiAKQEAgLTg2LDggKzk3LDM0IEBAIC0gKE5TTWVudSAqKW1lbnUKICAgICByZXR1cm4gW19waWNr ZXIgbWVudV07CiB9CiAKLSNwcmFnbWEgbWFyayBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdh dGUgbWV0aG9kcworLSAodm9pZClkaWRTaGFyZUltYWdlRGF0YTooTlNEYXRhICopZGF0YSBjb25m aXJtRGF0YUlzVmFsaWRUSUZGRGF0YTooQk9PTCljb25maXJtRGF0YQoreworICAgIFBhZ2UqIHBh Z2UgPSBbX21lbnVDbGllbnQtPndlYlZpZXcoKSBwYWdlXTsKKyAgICBpZiAoIXBhZ2UpCisgICAg ICAgIHJldHVybjsKKworICAgIGlmIChjb25maXJtRGF0YSkgeworICAgICAgICBSZXRhaW5QdHI8 TlNJbWFnZT4gbnNJbWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aERhdGE6 ZGF0YV0pOworICAgICAgICBpZiAoIW5zSW1hZ2UpIHsKKyAgICAgICAgICAgIExPR19FUlJPUigi U2hhcmVkIGltYWdlIGRhdGEgY2Fubm90IGNyZWF0ZSBhIHZhbGlkIE5TSW1hZ2UiKTsKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCisgICAgICAgIGRhdGEgPSBbbnNJbWFnZSBUSUZG UmVwcmVzZW50YXRpb25dOworICAgIH0KKworICAgIE5TUGFzdGVib2FyZCAqcGFzdGVib2FyZCA9 IFtOU1Bhc3RlYm9hcmQgcGFzdGVib2FyZFdpdGhOYW1lOnNlcnZpY2VDb250cm9sc1Bhc3RlYm9h cmROYW1lXTsKKyAgICBbcGFzdGVib2FyZCBkZWNsYXJlVHlwZXM6QFsgTlNQYXN0ZWJvYXJkVHlw ZVRJRkYgXSBvd25lcjpuaWxdOworICAgIFtwYXN0ZWJvYXJkIHNldERhdGE6ZGF0YSBmb3JUeXBl Ok5TUGFzdGVib2FyZFR5cGVUSUZGXTsKKworICAgIEZyYW1lJiBmcmFtZSA9IHBhZ2UtPmZvY3Vz Q29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOworICAgIGlmICghZnJhbWUuc2VsZWN0 aW9uKCkuaXNOb25lKCkpCisgICAgICAgIGZyYW1lLmVkaXRvcigpLnJlYWRTZWxlY3Rpb25Gcm9t UGFzdGVib2FyZChzZXJ2aWNlQ29udHJvbHNQYXN0ZWJvYXJkTmFtZSk7CiAKKyAgICBbc2VsZiBj bGVhcl07Cit9CisKKyNwcmFnbWEgbWFyayBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUg bWV0aG9kcwogCiAtIChOU0FycmF5ICopc2hhcmluZ1NlcnZpY2VQaWNrZXI6KE5TU2hhcmluZ1Nl cnZpY2VQaWNrZXIgKilzaGFyaW5nU2VydmljZVBpY2tlciBzaGFyaW5nU2VydmljZXNGb3JJdGVt czooTlNBcnJheSAqKWl0ZW1zIG1hc2s6KE5TU2hhcmluZ1NlcnZpY2VNYXNrKW1hc2sgcHJvcG9z ZWRTaGFyaW5nU2VydmljZXM6KE5TQXJyYXkgKilwcm9wb3NlZFNlcnZpY2VzCiB7CkBAIC0xMjMs MjUgKzE2MCwzMiBAQCAtICh2b2lkKXNoYXJpbmdTZXJ2aWNlOihOU1NoYXJpbmdTZXJ2aWNlICop c2hhcmluZ1NlcnZpY2UgZGlkU2hhcmVJdGVtczooTlNBcnJheQogICAgIGlmIChbaXRlbXMgY291 bnRdICE9IDEpCiAgICAgICAgIHJldHVybjsKIAotICAgIFJldGFpblB0cjxDR0ltYWdlU291cmNl UmVmPiBzb3VyY2UgPSBhZG9wdENGKENHSW1hZ2VTb3VyY2VDcmVhdGVXaXRoRGF0YSgoQ0ZEYXRh UmVmKVtpdGVtcyBvYmplY3RBdEluZGV4OjBdLCBOVUxMKSk7Ci0gICAgUmV0YWluUHRyPENHSW1h Z2VSZWY+IGNnSW1hZ2UgPSBhZG9wdENGKENHSW1hZ2VTb3VyY2VDcmVhdGVJbWFnZUF0SW5kZXgo c291cmNlLmdldCgpLCAwLCBOVUxMKSk7Ci0KLSAgICBpZiAoIWNnSW1hZ2UpCi0gICAgICAgIHJl dHVybjsKLQotICAgIFBhZ2UqIHBhZ2UgPSBbX21lbnVDbGllbnQtPndlYlZpZXcoKSBwYWdlXTsK LSAgICBpZiAoIXBhZ2UpCi0gICAgICAgIHJldHVybjsKKyAgICBpZCBpdGVtID0gW2l0ZW1zIG9i amVjdEF0SW5kZXg6MF07CiAKLSAgICBOU1Bhc3RlYm9hcmQgKnBhc3RlYm9hcmQgPSBbTlNQYXN0 ZWJvYXJkIHBhc3RlYm9hcmRXaXRoTmFtZTpzZXJ2aWNlQ29udHJvbHNQYXN0ZWJvYXJkTmFtZV07 Ci0gICAgW3Bhc3RlYm9hcmQgZGVjbGFyZVR5cGVzOkBbIE5TUGFzdGVib2FyZFR5cGVUSUZGIF0g b3duZXI6bmlsXTsKLSAgICBbcGFzdGVib2FyZCBzZXREYXRhOltpdGVtcyBvYmplY3RBdEluZGV4 OjBdIGZvclR5cGU6TlNQYXN0ZWJvYXJkVHlwZVRJRkZdOwotCi0gICAgRnJhbWUmIGZyYW1lID0g cGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7Ci0gICAgaWYgKCFm cmFtZS5zZWxlY3Rpb24oKS5pc05vbmUoKSkKLSAgICAgICAgZnJhbWUuZWRpdG9yKCkucmVhZFNl bGVjdGlvbkZyb21QYXN0ZWJvYXJkKHNlcnZpY2VDb250cm9sc1Bhc3RlYm9hcmROYW1lKTsKLQot ICAgIFtzZWxmIGNsZWFyXTsKKyAgICBpZiAoW2l0ZW0gaXNLaW5kT2ZDbGFzczpbTlNJbWFnZSBj bGFzc11dKQorICAgICAgICBbc2VsZiBkaWRTaGFyZUltYWdlRGF0YTpbaXRlbSBUSUZGUmVwcmVz ZW50YXRpb25dIGNvbmZpcm1EYXRhSXNWYWxpZFRJRkZEYXRhOk5PXTsKKyAgICBlbHNlIGlmIChb aXRlbSBpc0tpbmRPZkNsYXNzOltOU0l0ZW1Qcm92aWRlciBjbGFzc11dKSB7CisgICAgICAgIE5T SXRlbVByb3ZpZGVyICppdGVtUHJvdmlkZXIgPSAoTlNJdGVtUHJvdmlkZXIgKilpdGVtOworICAg ICAgICBOU1N0cmluZyAqaXRlbVVUSSA9IGl0ZW1Qcm92aWRlci5yZWdpc3RlcmVkVHlwZUlkZW50 aWZpZXJzLmZpcnN0T2JqZWN0OworICAgICAgICAKKyAgICAgICAgW2l0ZW1Qcm92aWRlciBsb2Fk SXRlbUZvclR5cGVJZGVudGlmaWVyOml0ZW1VVEkgb3B0aW9uczpuaWwgY29tcGxldGlvbkhhbmRs ZXI6XihpZCByZWNlaXZlZERhdGEsIE5TRXJyb3IgKmRhdGFFcnJvcikgeworICAgICAgICAgICAg aWYgKCFyZWNlaXZlZERhdGEpIHsKKyAgICAgICAgICAgICAgICBMT0dfRVJST1IoIkRpZCBub3Qg cmVjZWl2ZSBkYXRhIGZyb20gTlNJdGVtUHJvdmlkZXIiKTsKKyAgICAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlmICghW3JlY2VpdmVkRGF0YSBpc0tp bmRPZkNsYXNzOltOU0RhdGEgY2xhc3NdXSkgeworICAgICAgICAgICAgICAgIExPR19FUlJPUigi RGF0YSByZWNlaXZlZCBmcm9tIE5TSXRlbVByb3ZpZGVyIGlzIG5vdCBvZiB0eXBlIE5TRGF0YSIp OworICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAg W1tOU09wZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV0gYWRkT3BlcmF0aW9uV2l0aEJsb2NrOl57Cisg ICAgICAgICAgICAgICAgW3NlbGYgZGlkU2hhcmVJbWFnZURhdGE6cmVjZWl2ZWREYXRhIGNvbmZp cm1EYXRhSXNWYWxpZFRJRkZEYXRhOllFU107CisgICAgICAgICAgICB9XTsKKworICAgICAgICB9 XTsKKyAgICB9IGVsc2UKKyAgICAgICAgTE9HX0VSUk9SKCJzaGFyaW5nU2VydmljZTpkaWRTaGFy ZUl0ZW1zOiAtIFVua25vd24gaXRlbSB0eXBlIHJldHVybmVkIik7CiB9CiAKIC0gKHZvaWQpc2hh cmluZ1NlcnZpY2U6KE5TU2hhcmluZ1NlcnZpY2UgKilzaGFyaW5nU2VydmljZSBkaWRGYWlsVG9T aGFyZUl0ZW1zOihOU0FycmF5ICopaXRlbXMgZXJyb3I6KE5TRXJyb3IgKillcnJvcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGll bnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNs aWVudC5tbQppbmRleCA0Y2Q5MzBjLi42MTkxZjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbQpAQCAtNTAs NiArNTAsNyBAQAogI2ltcG9ydCA8V2ViQ29yZS9VUkwuaD4KICNpbXBvcnQgPFdlYkNvcmUvTG9j YWxpemVkU3RyaW5ncy5oPgogI2ltcG9ydCA8V2ViQ29yZS9QYWdlLmg+CisjaW1wb3J0IDxXZWJD b3JlL1NoYXJlZEJ1ZmZlci5oPgogI2ltcG9ydCA8V2ViQ29yZS9GcmFtZS5oPgogI2ltcG9ydCA8 V2ViQ29yZS9GcmFtZVZpZXcuaD4KICNpbXBvcnQgPFdlYkNvcmUvUnVudGltZUFwcGxpY2F0aW9u Q2hlY2tzLmg+CkBAIC0zNjMsOCArMzY0LDEzIEBAIE5TTWVudSAqV2ViQ29udGV4dE1lbnVDbGll bnQ6OmNvbnRleHRNZW51Rm9yRXZlbnQoTlNFdmVudCAqZXZlbnQsIE5TVmlldyAqdmlldykKICNp ZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKICAgICBpZiAoSW1hZ2UqIGltYWdlID0gcGFnZS0+ Y29udGV4dE1lbnVDb250cm9sbGVyKCkuY29udGV4dCgpLmNvbnRyb2xsZWRJbWFnZSgpKSB7CiAg ICAgICAgIEFTU0VSVChwYWdlLT5jb250ZXh0TWVudUNvbnRyb2xsZXIoKS5jb250ZXh0KCkuaGl0 VGVzdFJlc3VsdCgpLmlubmVyTm9kZSgpKTsKKworICAgICAgICBSZWZQdHI8U2hhcmVkQnVmZmVy PiBkYXRhID0gaW1hZ2UtPmRhdGEoKTsKKyAgICAgICAgQVNTRVJUKGRhdGEpOworICAgICAgICBS ZXRhaW5QdHI8Q0ZEYXRhUmVmPiBjZkRhdGEgPSBkYXRhLT5jcmVhdGVDRkRhdGEoKTsKKwogICAg ICAgICBib29sIGlzQ29udGVudEVkaXRhYmxlID0gcGFnZS0+Y29udGV4dE1lbnVDb250cm9sbGVy KCkuY29udGV4dCgpLmhpdFRlc3RSZXN1bHQoKS5pbm5lck5vZGUoKS0+aXNDb250ZW50RWRpdGFi bGUoKTsKLSAgICAgICAgbV9zaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIgPSBhZG9wdE5T KFtbV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aEltYWdl OmltYWdlLT5nZXROU0ltYWdlKCkgaW5jbHVkZUVkaXRvclNlcnZpY2VzOmlzQ29udGVudEVkaXRh YmxlIG1lbnVDbGllbnQ6dGhpc10pOworICAgICAgICBtX3NoYXJpbmdTZXJ2aWNlUGlja2VyQ29u dHJvbGxlciA9IGFkb3B0TlMoW1tXZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIgYWxs b2NdIGluaXRXaXRoRGF0YTooTlNEYXRhICopY2ZEYXRhLmdldCgpIGluY2x1ZGVFZGl0b3JTZXJ2 aWNlczppc0NvbnRlbnRFZGl0YWJsZSBtZW51Q2xpZW50OnRoaXNdKTsKICAgICAgICAgCiAgICAg ICAgIHJldHVybiBbbV9zaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIgbWVudV07CiAgICAg fQo=