196891 2019-04-12 18:28:10 -0700 Allow sharing from imageSheet on an image document 2019-04-16 18:42:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner commit-queue thorton webkit-bug-importer oldest_to_newest 1526973 0 megan_gardner 2019-04-12 18:28:10 -0700 Allow sharing from imageSheet on an image document 1526979 1 367368 megan_gardner 2019-04-12 18:36:44 -0700 Created attachment 367368 Patch 1526980 2 367368 thorton 2019-04-12 18:41:19 -0700 Comment on attachment 367368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367368&action=review > Source/WebKit/UIProcess/API/Cocoa/_WKActivatedElementInfo.mm:113 > +- (instancetype)_initWithType:(_WKActivatedElementType)type imageURL:(NSURL *)imageURL location:(CGPoint)location title:(NSString *)title ID:(NSString *)ID rect:(CGRect)rect image:(WebKit::ShareableBitmap*)image userInfo:(NSDictionary *)userInfo Why a new init method? Why not just add it to the previous one? You could easily have a WKActivatedElementInfo with BOTH a URL and imageURL (<a href="..."><img src="..."></a>), just like InteractionInformation > Source/WebKit/UIProcess/API/Cocoa/_WKElementAction.mm:135 > + if (actionInfo.URL) > + [assistant.delegate actionSheetAssistant:assistant shareElementWithURL:actionInfo.URL rect:actionInfo.boundingRect]; > + else > + [assistant.delegate actionSheetAssistant:assistant shareElementWithURL:actionInfo.imageURL rect:actionInfo.boundingRect]; I would write this as just [assistant.delegate actionSheetAssistant:assistant shareElementWithURL:(actionInfo.URL ?: actionInfo.imageURL) rect:actionInfo.boundingRect]; (maybe without the parens). Also not sure what you want to share if we have both! > Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:400 > + if (!targetURL) { > + NSURL *imageURL = _positionInformation->imageURL; See the above comments > Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:544 > + } else if ([elementInfo imageURL]) > + [defaultActions addObject:[_WKElementAction _elementActionWithType:_WKElementActionTypeShare assistant:self]]; instead of an else, you can merge this; if (targetURL) appendOpenActions; if (targetURL || imageURL) appendShareAction 1526992 3 367373 megan_gardner 2019-04-12 19:10:41 -0700 Created attachment 367373 Patch 1527456 4 367464 megan_gardner 2019-04-15 15:14:44 -0700 Created attachment 367464 Patch 1527973 5 367464 commit-queue 2019-04-16 18:41:06 -0700 Comment on attachment 367464 Patch Clearing flags on attachment: 367464 Committed r244368: <https://trac.webkit.org/changeset/244368> 1527974 6 commit-queue 2019-04-16 18:41:07 -0700 All reviewed patches have been landed. Closing bug. 1527975 7 webkit-bug-importer 2019-04-16 18:42:21 -0700 <rdar://problem/49962779> 367368 2019-04-12 18:36:44 -0700 2019-04-12 19:10:40 -0700 Patch bug-196891-20190412183643.patch text/plain 8642 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ1M2UwZWY2YjgzMmM5MjE5 MmRmMzhiZDgyZTA1ODQ0NjEwNDRjNDQuLjAxZmUzNzI0NzIyZDc5YmUwOWQ5ZjFkYmQyNjIxOTJi ZjUyMWM4MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDQtMTIgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBzaGFyaW5n IGZyb20gaW1hZ2VTaGVldCBvbiBhbiBpbWFnZSBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2ODkxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgc2hhcmluZyBmcm9tIGFuIGltYWdl IHNoZWV0IGdlbmVyYXRlZCBmcm9tIGFuIGltYWdlIGRvY3VtZW50CisgICAgICAgIGJ5IHN0b3Jp bmcgdGhlIGltYWdlIFVSTCBhbmQgdXNpbmcgaXQgYXMgYSBmYWxsYmFjayBmb3IgdGhlIFVSTC4K KyAgICAgICAgU3RvcmUgaXQgYXMgYW4gaW1hZ2Ugb24gV0tFbGVtZW50QWN0aW9uIHRvIG5vdCBh Y2NpZGVudGFsbHkgdHJpZ2dlcgorICAgICAgICBhbnkgYWN0aW9ucyB0aGF0IHNob3VsZCBhY3R1 YWxseSBiZSBhc3NvY2lhdGVkIHdpdGggcHVyZSBVUkxzLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW06CisgICAgICAgICgtW19XS0Fj dGl2YXRlZEVsZW1lbnRJbmZvIF9pbml0V2l0aEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uOl0pOgorICAgICAgICAoLVtfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBfaW5pdFdpdGhUeXBl OmltYWdlVVJMOmxvY2F0aW9uOnRpdGxlOklEOnJlY3Q6aW1hZ2U6dXNlckluZm86XSk6CisgICAg ICAgICgtW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGltYWdlVVJMXSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mb0ludGVybmFsLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tFbGVtZW50QWN0aW9uLm1tOgorICAgICAgICAo K1tfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6Y3VzdG9tVGl0bGU6YXNz aXN0YW50Ol0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFu dC5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93SW1hZ2VTaGVldF0p OgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9ySW1h Z2VTaGVldDpdKToKKwogMjAxOS0wNC0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBBbGxvdyB0aGUgTWVkaWFTb3VyY2UgQVBJIHRvIGJlIGVuYWJs ZWQgdmlhIHdlYnNpdGUgcG9saWN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8uaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCmluZGV4IDQ4OTg4MTJl MTVlZThlNzNhZjVlMWU3NjUzMzk4ZTIyZGEyZjIwMGUuLjZhNTY2ZGIyNWYwMDNhY2EwMDIxZTg4 ZDc0MDUzYjk1YjE3NjlmNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCkBAIC00Miw2ICs0Miw3 IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMCksIGlvcyg4LjApKQogQGludGVyZmFj ZSBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyA6IE5TT2JqZWN0CiAKIEBwcm9wZXJ0eSAobm9uYXRv bWljLCByZWFkb25seSkgTlNVUkwgKlVSTDsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25s eSkgTlNVUkwgKmltYWdlVVJMOwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU1N0 cmluZyAqdGl0bGU7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIF9XS0FjdGl2YXRl ZEVsZW1lbnRUeXBlIHR5cGU7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENHUmVj dCBib3VuZGluZ1JlY3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW0KaW5kZXggZDdkNDFlNGY4ZDky Yzg4ZTQwZjhiMGRjZGIyMzg2MTc1MDUwMDkwOC4uM2EwOGEzNmFiYzQ0NzE4ODI0MjdkOWM2ZmFk N2ZkNDFiNGRmYmQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5tbQpAQCAtMzksNiArMzksNyBA QAogCiBAaW1wbGVtZW50YXRpb24gX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gIHsKICAgICBSZXRh aW5QdHI8TlNVUkw+IF9VUkw7CisgICAgUmV0YWluUHRyPE5TVVJMPiBfaW1hZ2VVUkw7CiAgICAg UmV0YWluUHRyPE5TU3RyaW5nPiBfdGl0bGU7CiAgICAgQ0dQb2ludCBfaW50ZXJhY3Rpb25Mb2Nh dGlvbjsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9JRDsKQEAgLTY0LDYgKzY1LDcgQEAgLSAo aW5zdGFuY2V0eXBlKV9pbml0V2l0aEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOihj b25zdCBXZWJLaXQ6OkludGVyYWMKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICAKICAgICBfVVJM ID0gaW5mb3JtYXRpb24udXJsOworICAgIF9pbWFnZVVSTCA9IGluZm9ybWF0aW9uLmltYWdlVVJM OwogICAgIF9pbnRlcmFjdGlvbkxvY2F0aW9uID0gaW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludDsK ICAgICBfdGl0bGUgPSBpbmZvcm1hdGlvbi50aXRsZTsKICAgICBfYm91bmRpbmdSZWN0ID0gaW5m b3JtYXRpb24uYm91bmRzOwpAQCAtMTA4LDExICsxMTAsMzUgQEAgLSAoaW5zdGFuY2V0eXBlKV9p bml0V2l0aFR5cGU6KF9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlKXR5cGUgVVJMOihOU1VSTCAqKXVy bCBsb2MKICAgICByZXR1cm4gc2VsZjsKIH0KIAorLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aFR5 cGU6KF9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlKXR5cGUgaW1hZ2VVUkw6KE5TVVJMICopaW1hZ2VV UkwgbG9jYXRpb246KENHUG9pbnQpbG9jYXRpb24gdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgSUQ6 KE5TU3RyaW5nICopSUQgcmVjdDooQ0dSZWN0KXJlY3QgaW1hZ2U6KFdlYktpdDo6U2hhcmVhYmxl Qml0bWFwKilpbWFnZSB1c2VySW5mbzooTlNEaWN0aW9uYXJ5ICopdXNlckluZm8KK3sKKyAgICBp ZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICAKKyAg ICBfaW1hZ2VVUkwgPSBhZG9wdE5TKFtpbWFnZVVSTCBjb3B5XSk7CisgICAgX2ludGVyYWN0aW9u TG9jYXRpb24gPSBsb2NhdGlvbjsKKyAgICBfdGl0bGUgPSBhZG9wdE5TKFt0aXRsZSBjb3B5XSk7 CisgICAgX2JvdW5kaW5nUmVjdCA9IHJlY3Q7CisgICAgX3R5cGUgPSB0eXBlOworICAgIF9pbWFn ZSA9IGltYWdlOworICAgIF9JRCA9IElEOworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAg X3VzZXJJbmZvID0gYWRvcHROUyhbdXNlckluZm8gY29weV0pOworI2VuZGlmCisgICAgCisgICAg cmV0dXJuIHNlbGY7Cit9CisKIC0gKE5TVVJMICopVVJMCiB7CiAgICAgcmV0dXJuIF9VUkwuZ2V0 KCk7CiB9CiAKKy0gKE5TVVJMICopaW1hZ2VVUkwKK3sKKyAgICByZXR1cm4gX2ltYWdlVVJMLmdl dCgpOworfQorCiAtIChOU1N0cmluZyAqKXRpdGxlCiB7CiAgICAgcmV0dXJuIF90aXRsZS5nZXQo KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3Rp dmF0ZWRFbGVtZW50SW5mb0ludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm9JbnRlcm5hbC5oCmluZGV4IDI5NTFhZjc2YmQ5 ZjkwM2RjOWYxYjgxMmZkMDc3ZDJhMzFmYjI5MGEuLjRkYzFkMTFiZDhhNThjY2NiNDIyOGZlYTk4 MjlmYzQwNWRmYTVmYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mb0ludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvSW50ZXJuYWwuaApA QCAtNDAsNiArNDAsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKICNlbmRpZgogLSAoaW5zdGFuY2V0 eXBlKV9pbml0V2l0aFR5cGU6KF9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlKXR5cGUgVVJMOihOU1VS TCAqKXVybCBsb2NhdGlvbjooQ0dQb2ludClsb2NhdGlvbiB0aXRsZTooTlNTdHJpbmcgKil0aXRs ZSBJRDooTlNTdHJpbmcgKilJRCByZWN0OihDR1JlY3QpcmVjdCBpbWFnZTooV2ViS2l0OjpTaGFy ZWFibGVCaXRtYXAqKWltYWdlOwogLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aFR5cGU6KF9XS0Fj dGl2YXRlZEVsZW1lbnRUeXBlKXR5cGUgVVJMOihOU1VSTCAqKXVybCBsb2NhdGlvbjooQ0dQb2lu dClsb2NhdGlvbiB0aXRsZTooTlNTdHJpbmcgKil0aXRsZSBJRDooTlNTdHJpbmcgKilJRCByZWN0 OihDR1JlY3QpcmVjdCBpbWFnZTooV2ViS2l0OjpTaGFyZWFibGVCaXRtYXAqKWltYWdlIHVzZXJJ bmZvOihOU0RpY3Rpb25hcnkgKil1c2VySW5mbzsKKy0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhU eXBlOihfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZSl0eXBlIGltYWdlVVJMOihOU1VSTCAqKWltYWdl VVJMIGxvY2F0aW9uOihDR1BvaW50KWxvY2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElE OihOU1N0cmluZyAqKUlEIHJlY3Q6KENHUmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJs ZUJpdG1hcCopaW1hZ2UgdXNlckluZm86KE5TRGljdGlvbmFyeSAqKXVzZXJJbmZvOwogCiBAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENHUG9pbnQgX2ludGVyYWN0aW9uTG9jYXRpb247 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tFbGVt ZW50QWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0VsZW1l bnRBY3Rpb24ubW0KaW5kZXggM2M1MTBmNDMwMDJmOGM1YzllNjAyZmU4ZDNhYjhiMTQyOGYyZDU4 YS4uYzg0ODRjZmJlNmU3MWIwZTYwZmQ0YzBiZGRiNTJiOTBlOTczODhmYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0K QEAgLTEyOSw3ICsxMjksMTAgQEAgKyAoaW5zdGFuY2V0eXBlKV9lbGVtZW50QWN0aW9uV2l0aFR5 cGU6KF9XS0VsZW1lbnRBY3Rpb25UeXBlKXR5cGUgY3VzdG9tVGl0bGU6KE4KICAgICBjYXNlIF9X S0VsZW1lbnRBY3Rpb25UeXBlU2hhcmU6CiAgICAgICAgIHRpdGxlID0gV0VCX1VJX1NUUklORygi U2hhcmXigKYiLCAiVGl0bGUgZm9yIFNoYXJlIGFjdGlvbiBidXR0b24iKTsKICAgICAgICAgaGFu ZGxlciA9IF4oV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqYXNzaXN0YW50LCBfV0tBY3RpdmF0ZWRF bGVtZW50SW5mbyAqYWN0aW9uSW5mbykgewotICAgICAgICAgICAgW2Fzc2lzdGFudC5kZWxlZ2F0 ZSBhY3Rpb25TaGVldEFzc2lzdGFudDphc3Npc3RhbnQgc2hhcmVFbGVtZW50V2l0aFVSTDphY3Rp b25JbmZvLlVSTCByZWN0OmFjdGlvbkluZm8uYm91bmRpbmdSZWN0XTsKKyAgICAgICAgICAgIGlm IChhY3Rpb25JbmZvLlVSTCkKKyAgICAgICAgICAgICAgICBbYXNzaXN0YW50LmRlbGVnYXRlIGFj dGlvblNoZWV0QXNzaXN0YW50OmFzc2lzdGFudCBzaGFyZUVsZW1lbnRXaXRoVVJMOmFjdGlvbklu Zm8uVVJMIHJlY3Q6YWN0aW9uSW5mby5ib3VuZGluZ1JlY3RdOworICAgICAgICAgICAgZWxzZQor ICAgICAgICAgICAgICAgIFthc3Npc3RhbnQuZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnQ6 YXNzaXN0YW50IHNoYXJlRWxlbWVudFdpdGhVUkw6YWN0aW9uSW5mby5pbWFnZVVSTCByZWN0OmFj dGlvbkluZm8uYm91bmRpbmdSZWN0XTsKICAgICAgICAgfTsKICAgICAgICAgYnJlYWs7CiAgICAg ZGVmYXVsdDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlv blNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9u U2hlZXRBc3Npc3RhbnQubW0KaW5kZXggZjczYjg2NzNhODQ5NTk0YzUzNDMyODZlY2Y5NjczM2Vm NGRkNmU2Ni4uZDM3Mzg0MzU0YjhiMjZiODliMDAyYzhlMWFjODE5ZjRkYWRkYjBlZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQu bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3Rh bnQubW0KQEAgLTM5Niw2ICszOTYsMTAgQEAgLSAodm9pZClzaG93SW1hZ2VTaGVldAogICAgICAg ICAgICAgdGFyZ2V0VVJMID0gYWx0ZXJuYXRlVVJMOwogICAgICAgICBhdXRvIGVsZW1lbnRCb3Vu ZHMgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi0+Ym91bmRzOwogICAgICAgICBhdXRvIGVsZW1lbnRJ bmZvID0gYWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhU eXBlOl9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlSW1hZ2UgVVJMOnRhcmdldFVSTCBsb2NhdGlvbjpf cG9zaXRpb25JbmZvcm1hdGlvbi0+cmVxdWVzdC5wb2ludCB0aXRsZTpfcG9zaXRpb25JbmZvcm1h dGlvbi0+dGl0bGUgSUQ6X3Bvc2l0aW9uSW5mb3JtYXRpb24tPmlkQXR0cmlidXRlIHJlY3Q6ZWxl bWVudEJvdW5kcyBpbWFnZTpfcG9zaXRpb25JbmZvcm1hdGlvbi0+aW1hZ2UuZ2V0KCkgdXNlcklu Zm86dXNlckluZm9dKTsKKyAgICAgICAgaWYgKCF0YXJnZXRVUkwpIHsKKyAgICAgICAgICAgIE5T VVJMICppbWFnZVVSTCA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLT5pbWFnZVVSTDsKKyAgICAgICAg ICAgIGVsZW1lbnRJbmZvID0gYWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9j XSBfaW5pdFdpdGhUeXBlOl9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlSW1hZ2UgaW1hZ2VVUkw6aW1h Z2VVUkwgbG9jYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnJlcXVlc3QucG9pbnQgdGl0bGU6 X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0aW9uLT5pZEF0 dHJpYnV0ZSByZWN0OmVsZW1lbnRCb3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24tPmlt YWdlLmdldCgpIHVzZXJJbmZvOnVzZXJJbmZvXSk7CisgICAgICAgIH0KICAgICAgICAgaWYgKFtk ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGFjdGlvblNoZWV0QXNzaXN0YW50 OnNob3dDdXN0b21TaGVldEZvckVsZW1lbnQ6KV0gJiYgW2RlbGVnYXRlIGFjdGlvblNoZWV0QXNz aXN0YW50OnNlbGYgc2hvd0N1c3RvbVNoZWV0Rm9yRWxlbWVudDplbGVtZW50SW5mby5nZXQoKV0p CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGF1dG8gZGVmYXVsdEFjdGlvbnMgPSBbc2Vs ZiBkZWZhdWx0QWN0aW9uc0ZvckltYWdlU2hlZXQ6ZWxlbWVudEluZm8uZ2V0KCldOwpAQCAtNTM2 LDcgKzU0MCw4IEBAIC0gKFJldGFpblB0cjxOU0FycmF5PilkZWZhdWx0QWN0aW9uc0ZvckltYWdl U2hlZXQ6KF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICopZWxlCiAgICAgaWYgKHRhcmdldFVSTCkg ewogICAgICAgICBbc2VsZiBfYXBwZW5kT3BlbkFjdGlvbnNGb3JVUkw6dGFyZ2V0VVJMIGFjdGlv bnM6ZGVmYXVsdEFjdGlvbnMuZ2V0KCkgZWxlbWVudEluZm86ZWxlbWVudEluZm9dOwogICAgICAg ICBbZGVmYXVsdEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50QWN0 aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlvblR5cGVTaGFyZSBhc3Npc3RhbnQ6c2VsZl1dOwot ICAgIH0KKyAgICB9IGVsc2UgaWYgKFtlbGVtZW50SW5mbyBpbWFnZVVSTF0pCisgICAgICAgIFtk ZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRBY3Rpb24gX2VsZW1lbnRBY3Rpb25X aXRoVHlwZTpfV0tFbGVtZW50QWN0aW9uVHlwZVNoYXJlIGFzc2lzdGFudDpzZWxmXV07CiAKICNp ZiBIQVZFKFNBRkFSSV9TRVJWSUNFU19GUkFNRVdPUkspCiAgICAgaWYgKFtnZXRTU1JlYWRpbmdM aXN0Q2xhc3MoKSBzdXBwb3J0c1VSTDp0YXJnZXRVUkxdKQo= 367373 2019-04-12 19:10:41 -0700 2019-04-15 15:14:43 -0700 Patch bug-196891-20190412191041.patch text/plain 16722 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ1M2UwZWY2YjgzMmM5MjE5 MmRmMzhiZDgyZTA1ODQ0NjEwNDRjNDQuLjAxZmUzNzI0NzIyZDc5YmUwOWQ5ZjFkYmQyNjIxOTJi ZjUyMWM4MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTktMDQtMTIgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBzaGFyaW5n IGZyb20gaW1hZ2VTaGVldCBvbiBhbiBpbWFnZSBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2ODkxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxsb3cgc2hhcmluZyBmcm9tIGFuIGltYWdl IHNoZWV0IGdlbmVyYXRlZCBmcm9tIGFuIGltYWdlIGRvY3VtZW50CisgICAgICAgIGJ5IHN0b3Jp bmcgdGhlIGltYWdlIFVSTCBhbmQgdXNpbmcgaXQgYXMgYSBmYWxsYmFjayBmb3IgdGhlIFVSTC4K KyAgICAgICAgU3RvcmUgaXQgYXMgYW4gaW1hZ2Ugb24gV0tFbGVtZW50QWN0aW9uIHRvIG5vdCBh Y2NpZGVudGFsbHkgdHJpZ2dlcgorICAgICAgICBhbnkgYWN0aW9ucyB0aGF0IHNob3VsZCBhY3R1 YWxseSBiZSBhc3NvY2lhdGVkIHdpdGggcHVyZSBVUkxzLgorCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW06CisgICAgICAgICgtW19XS0Fj dGl2YXRlZEVsZW1lbnRJbmZvIF9pbml0V2l0aEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0 aW9uOl0pOgorICAgICAgICAoLVtfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBfaW5pdFdpdGhUeXBl OmltYWdlVVJMOmxvY2F0aW9uOnRpdGxlOklEOnJlY3Q6aW1hZ2U6dXNlckluZm86XSk6CisgICAg ICAgICgtW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGltYWdlVVJMXSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mb0ludGVybmFsLmg6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tFbGVtZW50QWN0aW9uLm1tOgorICAgICAgICAo K1tfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6Y3VzdG9tVGl0bGU6YXNz aXN0YW50Ol0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFu dC5tbToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93SW1hZ2VTaGVldF0p OgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9ySW1h Z2VTaGVldDpdKToKKwogMjAxOS0wNC0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBBbGxvdyB0aGUgTWVkaWFTb3VyY2UgQVBJIHRvIGJlIGVuYWJs ZWQgdmlhIHdlYnNpdGUgcG9saWN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8uaCBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCmluZGV4IDQ4OTg4MTJl MTVlZThlNzNhZjVlMWU3NjUzMzk4ZTIyZGEyZjIwMGUuLjZhNTY2ZGIyNWYwMDNhY2EwMDIxZTg4 ZDc0MDUzYjk1YjE3NjlmNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5oCkBAIC00Miw2ICs0Miw3 IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcygxMC4xMCksIGlvcyg4LjApKQogQGludGVyZmFj ZSBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyA6IE5TT2JqZWN0CiAKIEBwcm9wZXJ0eSAobm9uYXRv bWljLCByZWFkb25seSkgTlNVUkwgKlVSTDsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25s eSkgTlNVUkwgKmltYWdlVVJMOwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU1N0 cmluZyAqdGl0bGU7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIF9XS0FjdGl2YXRl ZEVsZW1lbnRUeXBlIHR5cGU7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENHUmVj dCBib3VuZGluZ1JlY3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW0KaW5kZXggZDdkNDFlNGY4ZDky Yzg4ZTQwZjhiMGRjZGIyMzg2MTc1MDUwMDkwOC4uNTQzMDQwM2I4NTU2OTNhZWYxMDM0Y2RjNDU3 MDcwNjczMjA1YTdjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5tbQpAQCAtMzksNiArMzksNyBA QAogCiBAaW1wbGVtZW50YXRpb24gX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gIHsKICAgICBSZXRh aW5QdHI8TlNVUkw+IF9VUkw7CisgICAgUmV0YWluUHRyPE5TVVJMPiBfaW1hZ2VVUkw7CiAgICAg UmV0YWluUHRyPE5TU3RyaW5nPiBfdGl0bGU7CiAgICAgQ0dQb2ludCBfaW50ZXJhY3Rpb25Mb2Nh dGlvbjsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF9JRDsKQEAgLTY0LDYgKzY1LDcgQEAgLSAo aW5zdGFuY2V0eXBlKV9pbml0V2l0aEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOihj b25zdCBXZWJLaXQ6OkludGVyYWMKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICAKICAgICBfVVJM ID0gaW5mb3JtYXRpb24udXJsOworICAgIF9pbWFnZVVSTCA9IGluZm9ybWF0aW9uLmltYWdlVVJM OwogICAgIF9pbnRlcmFjdGlvbkxvY2F0aW9uID0gaW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludDsK ICAgICBfdGl0bGUgPSBpbmZvcm1hdGlvbi50aXRsZTsKICAgICBfYm91bmRpbmdSZWN0ID0gaW5m b3JtYXRpb24uYm91bmRzOwpAQCAtODQsMTcgKzg2LDE4IEBAIC0gKGluc3RhbmNldHlwZSlfaW5p dFdpdGhJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjooY29uc3QgV2ViS2l0OjpJbnRl cmFjCiB9CiAjZW5kaWYKIAotLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aFR5cGU6KF9XS0FjdGl2 YXRlZEVsZW1lbnRUeXBlKXR5cGUgVVJMOihOU1VSTCAqKXVybCBsb2NhdGlvbjooQ0dQb2ludCls b2NhdGlvbiB0aXRsZTooTlNTdHJpbmcgKil0aXRsZSBJRDooTlNTdHJpbmcgKilJRCByZWN0OihD R1JlY3QpcmVjdCBpbWFnZTooV2ViS2l0OjpTaGFyZWFibGVCaXRtYXAqKWltYWdlCistIChpbnN0 YW5jZXR5cGUpX2luaXRXaXRoVHlwZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6 KE5TVVJMICopdXJsIGltYWdlVVJMOihOU1VSTCAqKWltYWdlVVJMIGxvY2F0aW9uOihDR1BvaW50 KWxvY2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElEOihOU1N0cmluZyAqKUlEIHJlY3Q6 KENHUmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcCopaW1hZ2UKIHsKLSAg ICByZXR1cm4gW3NlbGYgX2luaXRXaXRoVHlwZTp0eXBlIFVSTDp1cmwgbG9jYXRpb246bG9jYXRp b24gdGl0bGU6dGl0bGUgSUQ6SUQgcmVjdDpyZWN0IGltYWdlOmltYWdlIHVzZXJJbmZvOm5pbF07 CisgICAgcmV0dXJuIFtzZWxmIF9pbml0V2l0aFR5cGU6dHlwZSBVUkw6dXJsIGltYWdlVVJMOmlt YWdlVVJMIGxvY2F0aW9uOmxvY2F0aW9uIHRpdGxlOnRpdGxlIElEOklEIHJlY3Q6cmVjdCBpbWFn ZTppbWFnZSB1c2VySW5mbzpuaWxdOwogfQogCi0tIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoVHlw ZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6KE5TVVJMICopdXJsIGxvY2F0aW9u OihDR1BvaW50KWxvY2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElEOihOU1N0cmluZyAq KUlEIHJlY3Q6KENHUmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcCopaW1h Z2UgdXNlckluZm86KE5TRGljdGlvbmFyeSAqKXVzZXJJbmZvCistIChpbnN0YW5jZXR5cGUpX2lu aXRXaXRoVHlwZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6KE5TVVJMICopdXJs IGltYWdlVVJMOihOU1VSTCAqKWltYWdlVVJMIGxvY2F0aW9uOihDR1BvaW50KWxvY2F0aW9uIHRp dGxlOihOU1N0cmluZyAqKXRpdGxlIElEOihOU1N0cmluZyAqKUlEIHJlY3Q6KENHUmVjdClyZWN0 IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcCopaW1hZ2UgdXNlckluZm86KE5TRGljdGlv bmFyeSAqKXVzZXJJbmZvCiB7CiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAg ICAgIHJldHVybiBuaWw7CiAKICAgICBfVVJMID0gYWRvcHROUyhbdXJsIGNvcHldKTsKKyAgICBf aW1hZ2VVUkwgPSBhZG9wdE5TKFtpbWFnZVVSTCBjb3B5XSk7CiAgICAgX2ludGVyYWN0aW9uTG9j YXRpb24gPSBsb2NhdGlvbjsKICAgICBfdGl0bGUgPSBhZG9wdE5TKFt0aXRsZSBjb3B5XSk7CiAg ICAgX2JvdW5kaW5nUmVjdCA9IHJlY3Q7CkBAIC0xMTMsNiArMTE2LDExIEBAIC0gKE5TVVJMICop VVJMCiAgICAgcmV0dXJuIF9VUkwuZ2V0KCk7CiB9CiAKKy0gKE5TVVJMICopaW1hZ2VVUkwKK3sK KyAgICByZXR1cm4gX2ltYWdlVVJMLmdldCgpOworfQorCiAtIChOU1N0cmluZyAqKXRpdGxlCiB7 CiAgICAgcmV0dXJuIF90aXRsZS5nZXQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mb0ludGVybmFsLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm9JbnRl cm5hbC5oCmluZGV4IDI5NTFhZjc2YmQ5ZjkwM2RjOWYxYjgxMmZkMDc3ZDJhMzFmYjI5MGEuLjQy ZWUyNmQyMzJiY2MwMzc3NTg3ZTU4ZmYwMDQyNjA4Y2RkMjJiNWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mb0ludGVy bmFsLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRl ZEVsZW1lbnRJbmZvSW50ZXJuYWwuaApAQCAtMzgsOCArMzgsOCBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKICsgKGluc3RhbmNldHlwZSlhY3RpdmF0ZWRFbGVtZW50SW5mb1dpdGhJbnRlcmFjdGlvbklu Zm9ybWF0aW9uQXRQb3NpdGlvbjooY29uc3QgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9u QXRQb3NpdGlvbiYpaW5mb3JtYXRpb247CiAtIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoSW50ZXJh Y3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb246KGNvbnN0IFdlYktpdDo6SW50ZXJhY3Rpb25JbmZv cm1hdGlvbkF0UG9zaXRpb24mKWluZm9ybWF0aW9uOwogI2VuZGlmCi0tIChpbnN0YW5jZXR5cGUp X2luaXRXaXRoVHlwZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6KE5TVVJMICop dXJsIGxvY2F0aW9uOihDR1BvaW50KWxvY2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElE OihOU1N0cmluZyAqKUlEIHJlY3Q6KENHUmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJs ZUJpdG1hcCopaW1hZ2U7Ci0tIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoVHlwZTooX1dLQWN0aXZh dGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6KE5TVVJMICopdXJsIGxvY2F0aW9uOihDR1BvaW50KWxv Y2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElEOihOU1N0cmluZyAqKUlEIHJlY3Q6KENH UmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcCopaW1hZ2UgdXNlckluZm86 KE5TRGljdGlvbmFyeSAqKXVzZXJJbmZvOworLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aFR5cGU6 KF9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlKXR5cGUgVVJMOihOU1VSTCAqKXVybCBpbWFnZVVSTDoo TlNVUkwgKilpbWFnZVVSTCBsb2NhdGlvbjooQ0dQb2ludClsb2NhdGlvbiB0aXRsZTooTlNTdHJp bmcgKil0aXRsZSBJRDooTlNTdHJpbmcgKilJRCByZWN0OihDR1JlY3QpcmVjdCBpbWFnZTooV2Vi S2l0OjpTaGFyZWFibGVCaXRtYXAqKWltYWdlOworLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aFR5 cGU6KF9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlKXR5cGUgVVJMOihOU1VSTCAqKXVybCBpbWFnZVVS TDooTlNVUkwgKilpbWFnZVVSTCBsb2NhdGlvbjooQ0dQb2ludClsb2NhdGlvbiB0aXRsZTooTlNT dHJpbmcgKil0aXRsZSBJRDooTlNTdHJpbmcgKilJRCByZWN0OihDR1JlY3QpcmVjdCBpbWFnZToo V2ViS2l0OjpTaGFyZWFibGVCaXRtYXAqKWltYWdlIHVzZXJJbmZvOihOU0RpY3Rpb25hcnkgKil1 c2VySW5mbzsKIAogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBDR1BvaW50IF9pbnRl cmFjdGlvbkxvY2F0aW9uOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLRWxlbWVudEFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tFbGVtZW50QWN0aW9uLm1tCmluZGV4IDNjNTEwZjQzMDAyZjhjNWM5ZTYwMmZl OGQzYWI4YjE0MjhmMmQ1OGEuLjAyZDIxODU0MDc2MTQxZDRkNzg0ZmU5ZDk5YTFjZGI4NTFkYzlm YjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tFbGVt ZW50QWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tF bGVtZW50QWN0aW9uLm1tCkBAIC0xMjksNyArMTI5LDcgQEAgKyAoaW5zdGFuY2V0eXBlKV9lbGVt ZW50QWN0aW9uV2l0aFR5cGU6KF9XS0VsZW1lbnRBY3Rpb25UeXBlKXR5cGUgY3VzdG9tVGl0bGU6 KE4KICAgICBjYXNlIF9XS0VsZW1lbnRBY3Rpb25UeXBlU2hhcmU6CiAgICAgICAgIHRpdGxlID0g V0VCX1VJX1NUUklORygiU2hhcmXigKYiLCAiVGl0bGUgZm9yIFNoYXJlIGFjdGlvbiBidXR0b24i KTsKICAgICAgICAgaGFuZGxlciA9IF4oV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqYXNzaXN0YW50 LCBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqYWN0aW9uSW5mbykgewotICAgICAgICAgICAgW2Fz c2lzdGFudC5kZWxlZ2F0ZSBhY3Rpb25TaGVldEFzc2lzdGFudDphc3Npc3RhbnQgc2hhcmVFbGVt ZW50V2l0aFVSTDphY3Rpb25JbmZvLlVSTCByZWN0OmFjdGlvbkluZm8uYm91bmRpbmdSZWN0XTsK KyAgICAgICAgICAgIFthc3Npc3RhbnQuZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnQ6YXNz aXN0YW50IHNoYXJlRWxlbWVudFdpdGhVUkw6YWN0aW9uSW5mby5VUkwgPzogYWN0aW9uSW5mby5p bWFnZVVSTCByZWN0OmFjdGlvbkluZm8uYm91bmRpbmdSZWN0XTsKICAgICAgICAgfTsKICAgICAg ICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KaW5kZXggZjczYjg2NzNhODQ5NTk0YzUz NDMyODZlY2Y5NjczM2VmNGRkNmU2Ni4uOWY0ZWQ5MmU2MTMzNDU3YTdjZmJiMjExNjg5MGZmYjE1 ODEwYjViZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9u U2hlZXRBc3Npc3RhbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0 aW9uU2hlZXRBc3Npc3RhbnQubW0KQEAgLTM5MiwxMCArMzkyLDExIEBAIC0gKHZvaWQpc2hvd0lt YWdlU2hlZXQKIAogICAgIHZvaWQgKF5zaG93SW1hZ2VTaGVldFdpdGhBbHRlcm5hdGVVUkxCbG9j aykoTlNVUkwqLCBOU0RpY3Rpb25hcnkgKnVzZXJJbmZvKSA9IF4oTlNVUkwgKmFsdGVybmF0ZVVS TCwgTlNEaWN0aW9uYXJ5ICp1c2VySW5mbykgewogICAgICAgICBOU1VSTCAqdGFyZ2V0VVJMID0g X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnVybDsKKyAgICAgICAgTlNVUkwgKmltYWdlVVJMID0gX3Bv c2l0aW9uSW5mb3JtYXRpb24tPmltYWdlVVJMOwogICAgICAgICBpZiAoIXRhcmdldFVSTCkKICAg ICAgICAgICAgIHRhcmdldFVSTCA9IGFsdGVybmF0ZVVSTDsKICAgICAgICAgYXV0byBlbGVtZW50 Qm91bmRzID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24tPmJvdW5kczsKLSAgICAgICAgYXV0byBlbGVt ZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRX aXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUltYWdlIFVSTDp0YXJnZXRVUkwgbG9jYXRp b246X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5m b3JtYXRpb24tPnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0aW9uLT5pZEF0dHJpYnV0ZSByZWN0 OmVsZW1lbnRCb3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24tPmltYWdlLmdldCgpIHVz ZXJJbmZvOnVzZXJJbmZvXSk7CisgICAgICAgIGF1dG8gZWxlbWVudEluZm8gPSBhZG9wdE5TKFtb X1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVk RWxlbWVudFR5cGVJbWFnZSBVUkw6dGFyZ2V0VVJMIGltYWdlVVJMOmltYWdlVVJMIGxvY2F0aW9u Ol9wb3NpdGlvbkluZm9ybWF0aW9uLT5yZXF1ZXN0LnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9y bWF0aW9uLT50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi0+aWRBdHRyaWJ1dGUgcmVjdDpl bGVtZW50Qm91bmRzIGltYWdlOl9wb3NpdGlvbkluZm9ybWF0aW9uLT5pbWFnZS5nZXQoKSB1c2Vy SW5mbzp1c2VySW5mb10pOwogICAgICAgICBpZiAoW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IoYWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2hvd0N1c3RvbVNoZWV0Rm9yRWxlbWVu dDopXSAmJiBbZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZiBzaG93Q3VzdG9tU2hl ZXRGb3JFbGVtZW50OmVsZW1lbnRJbmZvLmdldCgpXSkKICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgYXV0byBkZWZhdWx0QWN0aW9ucyA9IFtzZWxmIGRlZmF1bHRBY3Rpb25zRm9ySW1hZ2VT aGVldDplbGVtZW50SW5mby5nZXQoKV07CkBAIC01MzYsNyArNTM3LDggQEAgLSAoUmV0YWluUHRy PE5TQXJyYXk+KWRlZmF1bHRBY3Rpb25zRm9ySW1hZ2VTaGVldDooX1dLQWN0aXZhdGVkRWxlbWVu dEluZm8gKillbGUKICAgICBpZiAodGFyZ2V0VVJMKSB7CiAgICAgICAgIFtzZWxmIF9hcHBlbmRP cGVuQWN0aW9uc0ZvclVSTDp0YXJnZXRVUkwgYWN0aW9uczpkZWZhdWx0QWN0aW9ucy5nZXQoKSBl bGVtZW50SW5mbzplbGVtZW50SW5mb107CiAgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmpl Y3Q6W19XS0VsZW1lbnRBY3Rpb24gX2VsZW1lbnRBY3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0 aW9uVHlwZVNoYXJlIGFzc2lzdGFudDpzZWxmXV07Ci0gICAgfQorICAgIH0gZWxzZSBpZiAoW2Vs ZW1lbnRJbmZvIGltYWdlVVJMXSkKKyAgICAgICAgW2RlZmF1bHRBY3Rpb25zIGFkZE9iamVjdDpb X1dLRWxlbWVudEFjdGlvbiBfZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25U eXBlU2hhcmUgYXNzaXN0YW50OnNlbGZdXTsKIAogI2lmIEhBVkUoU0FGQVJJX1NFUlZJQ0VTX0ZS QU1FV09SSykKICAgICBpZiAoW2dldFNTUmVhZGluZ0xpc3RDbGFzcygpIHN1cHBvcnRzVVJMOnRh cmdldFVSTF0pCkBAIC01NzEsNyArNTczLDcgQEAgLSAodm9pZClzaG93TGlua1NoZWV0CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBhdXRvIGVsZW1lbnRJbmZvID0gYWRvcHROUyhbW19X S0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBlOl9XS0FjdGl2YXRlZEVs ZW1lbnRUeXBlTGluayBVUkw6dGFyZ2V0VVJMIGxvY2F0aW9uOl9wb3NpdGlvbkluZm9ybWF0aW9u LT5yZXF1ZXN0LnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLT50aXRsZSBJRDpfcG9z aXRpb25JbmZvcm1hdGlvbi0+aWRBdHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25JbmZvcm1hdGlvbi0+ Ym91bmRzIGltYWdlOl9wb3NpdGlvbkluZm9ybWF0aW9uLT5pbWFnZS5nZXQoKV0pOworICAgIGF1 dG8gZWxlbWVudEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2Nd IF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVMaW5rIFVSTDp0YXJnZXRVUkwg aW1hZ2VVUkw6KE5TVVJMKilfcG9zaXRpb25JbmZvcm1hdGlvbi0+aW1hZ2VVUkwgbG9jYXRpb246 X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3Jt YXRpb24tPnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0aW9uLT5pZEF0dHJpYnV0ZSByZWN0Ol9w b3NpdGlvbkluZm9ybWF0aW9uLT5ib3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24tPmlt YWdlLmdldCgpXSk7CiAgICAgaWYgKFtfZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3RvcihhY3Rpb25TaGVldEFzc2lzdGFudDpzaG93Q3VzdG9tU2hlZXRGb3JFbGVtZW50OildICYm IFtfZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZiBzaG93Q3VzdG9tU2hlZXRGb3JF bGVtZW50OmVsZW1lbnRJbmZvLmdldCgpXSkgewogICAgICAgICBfbmVlZHNMaW5rSW5kaWNhdG9y ID0gTk87CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDg0ZTczMWZjNDJkMzY5 NzVkMDc5NDNhYWM5MTQwZjIwMmIwZjA5MDEuLjc0MzkyMDRkYWIzNzY2NzZkMWZmNmVlMDBjNjcx OTYyYjNjZjI5NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0Nv bnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9z L1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMTc5MSw3ICsxNzkxLDcgQEAgLSAodm9p ZClfc2hvd0F0dGFjaG1lbnRTaGVldAogICAgIGlmICghW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpzaG93Q3VzdG9tU2hlZXRGb3JFbGVtZW50OildKQog ICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIGVsZW1lbnQgPSBhZG9wdE5TKFtbX1dLQWN0aXZh dGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5 cGVBdHRhY2htZW50IFVSTDooTlNVUkwgKilfcG9zaXRpb25JbmZvcm1hdGlvbi51cmwgbG9jYXRp b246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpfcG9zaXRpb25JbmZv cm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJpYnV0ZSByZWN0Ol9w b3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpuaWxdKTsKKyAgICBhdXRvIGVsZW1lbnQg PSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6 X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVBdHRhY2htZW50IFVSTDooTlNVUkwgKilfcG9zaXRpb25J bmZvcm1hdGlvbi51cmwgaW1hZ2VVUkw6KE5TVVJMICopX3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1h Z2VVUkwgbG9jYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpf cG9zaXRpb25JbmZvcm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJp YnV0ZSByZWN0Ol9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpuaWxdKTsKICAgICBb dWlEZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyBzaG93Q3VzdG9tU2hlZXRGb3JFbGVtZW50OmVs ZW1lbnQuZ2V0KCldOwogfQogCkBAIC03MjQzLDcgKzcyNDMsNyBAQCAtIChOU0RpY3Rpb25hcnkg KilfZGF0YUZvclByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2aWV3SXRlbUNvbnRyb2xsZXIg Kiljb250cgogICAgICAgICBkYXRhRm9yUHJldmlld1tVSVByZXZpZXdEYXRhTGlua10gPSAoTlNV UkwgKilfcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZVVSTDsKICAgICB9IGVsc2UgaWYgKGNhblNo b3dBdHRhY2htZW50UHJldmlldykgewogICAgICAgICAqdHlwZSA9IFVJUHJldmlld0l0ZW1UeXBl QXR0YWNobWVudDsKLSAgICAgICAgYXV0byBlbGVtZW50ID0gYWRvcHROUyhbW19XS0FjdGl2YXRl ZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBlOl9XS0FjdGl2YXRlZEVsZW1lbnRUeXBl QXR0YWNobWVudCBVUkw6KE5TVVJMICopbGlua1VSTCBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1h dGlvbi5yZXF1ZXN0LnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIElEOl9w b3NpdGlvbkluZm9ybWF0aW9uLmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24u Ym91bmRzIGltYWdlOm5pbF0pOworICAgICAgICBhdXRvIGVsZW1lbnQgPSBhZG9wdE5TKFtbX1dL QWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxl bWVudFR5cGVBdHRhY2htZW50IFVSTDooTlNVUkwgKilsaW5rVVJMIGltYWdlVVJMOihOU1VSTCAq KV9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlVVJMIGxvY2F0aW9uOl9wb3NpdGlvbkluZm9ybWF0 aW9uLnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUgSUQ6X3Bv c2l0aW9uSW5mb3JtYXRpb24uaWRBdHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25JbmZvcm1hdGlvbi5i b3VuZHMgaW1hZ2U6bmlsXSk7CiAgICAgICAgIE5TVUludGVnZXIgaW5kZXggPSBbdWlEZWxlZ2F0 ZSBfd2ViVmlldzpfd2ViVmlldyBpbmRleEludG9BdHRhY2htZW50TGlzdEZvckVsZW1lbnQ6ZWxl bWVudC5nZXQoKV07CiAgICAgICAgIGlmIChpbmRleCAhPSBOU05vdEZvdW5kKSB7CiAgICAgICAg ICAgICBCT09MIHNvdXJjZUlzTWFuYWdlZCA9IE5POwpAQCAtNzMwNSw3ICs3MzA1LDcgQEAgLSAo VUlWaWV3Q29udHJvbGxlciAqKV9wcmVzZW50ZWRWaWV3Q29udHJvbGxlckZvclByZXZpZXdJdGVt Q29udHJvbGxlcjooVUlQcmV2aWUKIAogICAgICAgICAvLyBUcmVhdCBhbmltYXRlZCBpbWFnZXMg bGlrZSBhIGxpbmsgcHJldmlldwogICAgICAgICBpZiAoaXNWYWxpZFVSTEZvckltYWdlUHJldmll dyAmJiBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0FuaW1hdGVkSW1hZ2UpIHsKLSAgICAgICAgICAg IFJldGFpblB0cjxfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbz4gYW5pbWF0ZWRJbWFnZUVsZW1lbnRJ bmZvID0gYWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhU eXBlOl9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlSW1hZ2UgVVJMOnRhcmdldFVSTCBsb2NhdGlvbjpf cG9zaXRpb25JbmZvcm1hdGlvbi5yZXF1ZXN0LnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0 aW9uLnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0aW9uLmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0 aW9uSW5mb3JtYXRpb24uYm91bmRzIGltYWdlOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlLmdl dCgpXSk7CisgICAgICAgICAgICBSZXRhaW5QdHI8X1dLQWN0aXZhdGVkRWxlbWVudEluZm8+IGFu aW1hdGVkSW1hZ2VFbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5m byBhbGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUltYWdlIFVSTDp0 YXJnZXRVUkwgaW1hZ2VVUkw6bmlsIGxvY2F0aW9uOl9wb3NpdGlvbkluZm9ybWF0aW9uLnJlcXVl c3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUgSUQ6X3Bvc2l0aW9uSW5m b3JtYXRpb24uaWRBdHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHMgaW1h Z2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2UuZ2V0KCldKTsKIAogICAgICAgICAgICAgaWYg KFt1aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cHJldmll d1ZpZXdDb250cm9sbGVyRm9yQW5pbWF0ZWRJbWFnZUF0VVJMOmRlZmF1bHRBY3Rpb25zOmVsZW1l bnRJbmZvOmltYWdlU2l6ZTopXSkgewogICAgICAgICAgICAgICAgIFJldGFpblB0cjxOU0FycmF5 PiBhY3Rpb25zID0gW19hY3Rpb25TaGVldEFzc2lzdGFudCBkZWZhdWx0QWN0aW9uc0ZvckltYWdl U2hlZXQ6YW5pbWF0ZWRJbWFnZUVsZW1lbnRJbmZvLmdldCgpXTsKQEAgLTczMTMsNyArNzMxMyw3 IEBAIC0gKFVJVmlld0NvbnRyb2xsZXIgKilfcHJlc2VudGVkVmlld0NvbnRyb2xsZXJGb3JQcmV2 aWV3SXRlbUNvbnRyb2xsZXI6KFVJUHJldmllCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAot ICAgICAgICBSZXRhaW5QdHI8X1dLQWN0aXZhdGVkRWxlbWVudEluZm8+IGVsZW1lbnRJbmZvID0g YWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBlOl9X S0FjdGl2YXRlZEVsZW1lbnRUeXBlTGluayBVUkw6dGFyZ2V0VVJMIGxvY2F0aW9uOl9wb3NpdGlv bkluZm9ybWF0aW9uLnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0 bGUgSUQ6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaWRBdHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25JbmZv cm1hdGlvbi5ib3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2UuZ2V0KCldKTsK KyAgICAgICAgUmV0YWluUHRyPF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvPiBlbGVtZW50SW5mbyA9 IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpf V0tBY3RpdmF0ZWRFbGVtZW50VHlwZUxpbmsgVVJMOnRhcmdldFVSTCBpbWFnZVVSTDpuaWwgbG9j YXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpfcG9zaXRpb25J bmZvcm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJpYnV0ZSByZWN0 Ol9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpfcG9zaXRpb25JbmZvcm1hdGlvbi5p bWFnZS5nZXQoKV0pOwogCiAgICAgICAgIGF1dG8gYWN0aW9ucyA9IFtfYWN0aW9uU2hlZXRBc3Np c3RhbnQgZGVmYXVsdEFjdGlvbnNGb3JMaW5rU2hlZXQ6ZWxlbWVudEluZm8uZ2V0KCldOwogICAg ICAgICBpZiAoW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3 OnByZXZpZXdpbmdWaWV3Q29udHJvbGxlckZvckVsZW1lbnQ6ZGVmYXVsdEFjdGlvbnM6KV0pIHsK QEAgLTczNTEsNyArNzM1MSw3IEBAIC0gKFVJVmlld0NvbnRyb2xsZXIgKilfcHJlc2VudGVkVmll d0NvbnRyb2xsZXJGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6KFVJUHJldmllCiAgICAgICAgICAg ICBpbWFnZUluZm8gPSB1c2VySW5mbzsKICAgICAgICAgfQogCi0gICAgICAgIFJldGFpblB0cjxf V0tBY3RpdmF0ZWRFbGVtZW50SW5mbz4gZWxlbWVudEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZh dGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5 cGVJbWFnZSBVUkw6YWx0ZXJuYXRlVVJMLmdldCgpIGxvY2F0aW9uOl9wb3NpdGlvbkluZm9ybWF0 aW9uLnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUgSUQ6X3Bv c2l0aW9uSW5mb3JtYXRpb24uaWRBdHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25JbmZvcm1hdGlvbi5i b3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2UuZ2V0KCkgdXNlckluZm86aW1h Z2VJbmZvLmdldCgpXSk7CisgICAgICAgIFJldGFpblB0cjxfV0tBY3RpdmF0ZWRFbGVtZW50SW5m bz4gZWxlbWVudEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2Nd IF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVJbWFnZSBVUkw6YWx0ZXJuYXRl VVJMLmdldCgpIGltYWdlVVJMOm5pbCBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1hdGlvbi5yZXF1 ZXN0LnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIElEOl9wb3NpdGlvbklu Zm9ybWF0aW9uLmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzIGlt YWdlOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlLmdldCgpIHVzZXJJbmZvOmltYWdlSW5mby5n ZXQoKV0pOwogICAgICAgICBfcGFnZS0+c3RhcnRJbnRlcmFjdGlvbldpdGhFbGVtZW50QXRQb3Np dGlvbihfcG9zaXRpb25JbmZvcm1hdGlvbi5yZXF1ZXN0LnBvaW50KTsKIAogICAgICAgICBpZiAo W3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzp3aWxsUHJl dmlld0ltYWdlV2l0aFVSTDopXSkK 367464 2019-04-15 15:14:44 -0700 2019-04-16 18:41:06 -0700 Patch bug-196891-20190415151443.patch text/plain 19973 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQ1M2UwZWY2YjgzMmM5MjE5 MmRmMzhiZDgyZTA1ODQ0NjEwNDRjNDQuLjIzYjQ5NTE1MjljODcwM2MyZGM2NGVjMmM0ZjgyMDBm Mjc2OTRhZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTktMDQtMTUgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBBbGxvdyBzaGFyaW5n IGZyb20gaW1hZ2VTaGVldCBvbiBhbiBpbWFnZSBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk2ODkxCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yNTM3NzM4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBbGxvdyBzaGFyaW5nIGZyb20gYW4gaW1hZ2Ugc2hlZXQgZ2VuZXJhdGVkIGZyb20g YW4gaW1hZ2UgZG9jdW1lbnQKKyAgICAgICAgYnkgc3RvcmluZyB0aGUgaW1hZ2UgVVJMIGFuZCB1 c2luZyBpdCBhcyBhIGZhbGxiYWNrIGZvciB0aGUgVVJMLgorICAgICAgICBTdG9yZSBpdCBhcyBh biBpbWFnZSBvbiBXS0VsZW1lbnRBY3Rpb24gdG8gbm90IGFjY2lkZW50YWxseSB0cmlnZ2VyCisg ICAgICAgIGFueSBhY3Rpb25zIHRoYXQgc2hvdWxkIGFjdHVhbGx5IGJlIGFzc29jaWF0ZWQgd2l0 aCBwdXJlIFVSTHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRl ZEVsZW1lbnRJbmZvLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0 ZWRFbGVtZW50SW5mby5tbToKKyAgICAgICAgKC1bX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gX2lu aXRXaXRoSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb246XSk6CisgICAgICAgICgtW19X S0FjdGl2YXRlZEVsZW1lbnRJbmZvIF9pbml0V2l0aFR5cGU6VVJMOmltYWdlVVJMOmxvY2F0aW9u OnRpdGxlOklEOnJlY3Q6aW1hZ2U6XSk6CisgICAgICAgICgtW19XS0FjdGl2YXRlZEVsZW1lbnRJ bmZvIF9pbml0V2l0aFR5cGU6VVJMOmltYWdlVVJMOmxvY2F0aW9uOnRpdGxlOklEOnJlY3Q6aW1h Z2U6dXNlckluZm86XSk6CisgICAgICAgICgtW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGltYWdl VVJMXSk6CisgICAgICAgICgtW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIF9pbml0V2l0aFR5cGU6 VVJMOmxvY2F0aW9uOnRpdGxlOklEOnJlY3Q6aW1hZ2U6XSk6IERlbGV0ZWQuCisgICAgICAgICgt W19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIF9pbml0V2l0aFR5cGU6VVJMOmxvY2F0aW9uOnRpdGxl OklEOnJlY3Q6aW1hZ2U6dXNlckluZm86XSk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mb0ludGVybmFsLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tFbGVtZW50QWN0aW9uLm1tOgorICAgICAgICAoK1tfV0tF bGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6Y3VzdG9tVGl0bGU6YXNzaXN0YW50 Ol0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbToK KyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93SW1hZ2VTaGVldF0pOgorICAg ICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9ySW1hZ2VTaGVl dDpdKToKKyAgICAgICAgKC1bV0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93TGlua1NoZWV0XSk6 CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW06Cisg ICAgICAgICgtW1dLQ29udGVudFZpZXcgX3Nob3dBdHRhY2htZW50U2hlZXRdKToKKyAgICAgICAg KC1bV0tDb250ZW50VmlldyBfZGF0YUZvclByZXZpZXdJdGVtQ29udHJvbGxlcjphdFBvc2l0aW9u OnR5cGU6XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3ByZXNlbnRlZFZpZXdDb250cm9s bGVyRm9yUHJldmlld0l0ZW1Db250cm9sbGVyOl0pOgorCiAyMDE5LTA0LTExICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFsbG93IHRoZSBNZWRpYVNv dXJjZSBBUEkgdG8gYmUgZW5hYmxlZCB2aWEgd2Vic2l0ZSBwb2xpY3kKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJ bmZvLmgKaW5kZXggNDg5ODgxMmUxNWVlOGU3M2FmNWUxZTc2NTMzOThlMjJkYTJmMjAwZS4uNmE1 NjZkYjI1ZjAwM2FjYTAwMjFlODhkNzQwNTNiOTViMTc2OWY0MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvLmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJ bmZvLmgKQEAgLTQyLDYgKzQyLDcgQEAgV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zKDEwLjEwKSwg aW9zKDguMCkpCiBAaW50ZXJmYWNlIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIDogTlNPYmplY3QK IAogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU1VSTCAqVVJMOworQHByb3BlcnR5 IChub25hdG9taWMsIHJlYWRvbmx5KSBOU1VSTCAqaW1hZ2VVUkw7CiBAcHJvcGVydHkgKG5vbmF0 b21pYywgcmVhZG9ubHkpIE5TU3RyaW5nICp0aXRsZTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBy ZWFkb25seSkgX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUgdHlwZTsKIEBwcm9wZXJ0eSAobm9uYXRv bWljLCByZWFkb25seSkgQ0dSZWN0IGJvdW5kaW5nUmVjdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3RpdmF0ZWRFbGVtZW50SW5mby5t bQppbmRleCBkN2Q0MWU0ZjhkOTJjODhlNDBmOGIwZGNkYjIzODYxNzUwNTAwOTA4Li41NDMwNDAz Yjg1NTY5M2FlZjEwMzRjZGM0NTcwNzA2NzMyMDVhN2M3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm8ubW0KKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJbmZv Lm1tCkBAIC0zOSw2ICszOSw3IEBACiAKIEBpbXBsZW1lbnRhdGlvbiBfV0tBY3RpdmF0ZWRFbGVt ZW50SW5mbyAgewogICAgIFJldGFpblB0cjxOU1VSTD4gX1VSTDsKKyAgICBSZXRhaW5QdHI8TlNV Ukw+IF9pbWFnZVVSTDsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IF90aXRsZTsKICAgICBDR1Bv aW50IF9pbnRlcmFjdGlvbkxvY2F0aW9uOwogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX0lEOwpA QCAtNjQsNiArNjUsNyBAQCAtIChpbnN0YW5jZXR5cGUpX2luaXRXaXRoSW50ZXJhY3Rpb25JbmZv cm1hdGlvbkF0UG9zaXRpb246KGNvbnN0IFdlYktpdDo6SW50ZXJhYwogICAgICAgICByZXR1cm4g bmlsOwogICAgIAogICAgIF9VUkwgPSBpbmZvcm1hdGlvbi51cmw7CisgICAgX2ltYWdlVVJMID0g aW5mb3JtYXRpb24uaW1hZ2VVUkw7CiAgICAgX2ludGVyYWN0aW9uTG9jYXRpb24gPSBpbmZvcm1h dGlvbi5yZXF1ZXN0LnBvaW50OwogICAgIF90aXRsZSA9IGluZm9ybWF0aW9uLnRpdGxlOwogICAg IF9ib3VuZGluZ1JlY3QgPSBpbmZvcm1hdGlvbi5ib3VuZHM7CkBAIC04NCwxNyArODYsMTggQEAg LSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9u Oihjb25zdCBXZWJLaXQ6OkludGVyYWMKIH0KICNlbmRpZgogCi0tIChpbnN0YW5jZXR5cGUpX2lu aXRXaXRoVHlwZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6KE5TVVJMICopdXJs IGxvY2F0aW9uOihDR1BvaW50KWxvY2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElEOihO U1N0cmluZyAqKUlEIHJlY3Q6KENHUmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJsZUJp dG1hcCopaW1hZ2UKKy0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhUeXBlOihfV0tBY3RpdmF0ZWRF bGVtZW50VHlwZSl0eXBlIFVSTDooTlNVUkwgKil1cmwgaW1hZ2VVUkw6KE5TVVJMICopaW1hZ2VV UkwgbG9jYXRpb246KENHUG9pbnQpbG9jYXRpb24gdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgSUQ6 KE5TU3RyaW5nICopSUQgcmVjdDooQ0dSZWN0KXJlY3QgaW1hZ2U6KFdlYktpdDo6U2hhcmVhYmxl Qml0bWFwKilpbWFnZQogewotICAgIHJldHVybiBbc2VsZiBfaW5pdFdpdGhUeXBlOnR5cGUgVVJM OnVybCBsb2NhdGlvbjpsb2NhdGlvbiB0aXRsZTp0aXRsZSBJRDpJRCByZWN0OnJlY3QgaW1hZ2U6 aW1hZ2UgdXNlckluZm86bmlsXTsKKyAgICByZXR1cm4gW3NlbGYgX2luaXRXaXRoVHlwZTp0eXBl IFVSTDp1cmwgaW1hZ2VVUkw6aW1hZ2VVUkwgbG9jYXRpb246bG9jYXRpb24gdGl0bGU6dGl0bGUg SUQ6SUQgcmVjdDpyZWN0IGltYWdlOmltYWdlIHVzZXJJbmZvOm5pbF07CiB9CiAKLS0gKGluc3Rh bmNldHlwZSlfaW5pdFdpdGhUeXBlOihfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZSl0eXBlIFVSTDoo TlNVUkwgKil1cmwgbG9jYXRpb246KENHUG9pbnQpbG9jYXRpb24gdGl0bGU6KE5TU3RyaW5nICop dGl0bGUgSUQ6KE5TU3RyaW5nICopSUQgcmVjdDooQ0dSZWN0KXJlY3QgaW1hZ2U6KFdlYktpdDo6 U2hhcmVhYmxlQml0bWFwKilpbWFnZSB1c2VySW5mbzooTlNEaWN0aW9uYXJ5ICopdXNlckluZm8K Ky0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhUeXBlOihfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZSl0 eXBlIFVSTDooTlNVUkwgKil1cmwgaW1hZ2VVUkw6KE5TVVJMICopaW1hZ2VVUkwgbG9jYXRpb246 KENHUG9pbnQpbG9jYXRpb24gdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgSUQ6KE5TU3RyaW5nICop SUQgcmVjdDooQ0dSZWN0KXJlY3QgaW1hZ2U6KFdlYktpdDo6U2hhcmVhYmxlQml0bWFwKilpbWFn ZSB1c2VySW5mbzooTlNEaWN0aW9uYXJ5ICopdXNlckluZm8KIHsKICAgICBpZiAoIShzZWxmID0g W3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIF9VUkwgPSBhZG9wdE5T KFt1cmwgY29weV0pOworICAgIF9pbWFnZVVSTCA9IGFkb3B0TlMoW2ltYWdlVVJMIGNvcHldKTsK ICAgICBfaW50ZXJhY3Rpb25Mb2NhdGlvbiA9IGxvY2F0aW9uOwogICAgIF90aXRsZSA9IGFkb3B0 TlMoW3RpdGxlIGNvcHldKTsKICAgICBfYm91bmRpbmdSZWN0ID0gcmVjdDsKQEAgLTExMyw2ICsx MTYsMTEgQEAgLSAoTlNVUkwgKilVUkwKICAgICByZXR1cm4gX1VSTC5nZXQoKTsKIH0KIAorLSAo TlNVUkwgKilpbWFnZVVSTAoreworICAgIHJldHVybiBfaW1hZ2VVUkwuZ2V0KCk7Cit9CisKIC0g KE5TU3RyaW5nICopdGl0bGUKIHsKICAgICByZXR1cm4gX3RpdGxlLmdldCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2YXRlZEVsZW1lbnRJ bmZvSW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tBY3Rp dmF0ZWRFbGVtZW50SW5mb0ludGVybmFsLmgKaW5kZXggMjk1MWFmNzZiZDlmOTAzZGM5ZjFiODEy ZmQwNzdkMmEzMWZiMjkwYS4uNDJlZTI2ZDIzMmJjYzAzNzc1ODdlNThmZjAwNDI2MDhjZGQyMmI1 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0FjdGl2 YXRlZEVsZW1lbnRJbmZvSW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLQWN0aXZhdGVkRWxlbWVudEluZm9JbnRlcm5hbC5oCkBAIC0zOCw4ICszOCw4 IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogKyAoaW5zdGFuY2V0eXBlKWFjdGl2YXRlZEVsZW1lbnRJ bmZvV2l0aEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOihjb25zdCBXZWJLaXQ6Oklu dGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJilpbmZvcm1hdGlvbjsKIC0gKGluc3RhbmNl dHlwZSlfaW5pdFdpdGhJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbjooY29uc3QgV2Vi S2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbiYpaW5mb3JtYXRpb247CiAjZW5k aWYKLS0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhUeXBlOihfV0tBY3RpdmF0ZWRFbGVtZW50VHlw ZSl0eXBlIFVSTDooTlNVUkwgKil1cmwgbG9jYXRpb246KENHUG9pbnQpbG9jYXRpb24gdGl0bGU6 KE5TU3RyaW5nICopdGl0bGUgSUQ6KE5TU3RyaW5nICopSUQgcmVjdDooQ0dSZWN0KXJlY3QgaW1h Z2U6KFdlYktpdDo6U2hhcmVhYmxlQml0bWFwKilpbWFnZTsKLS0gKGluc3RhbmNldHlwZSlfaW5p dFdpdGhUeXBlOihfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZSl0eXBlIFVSTDooTlNVUkwgKil1cmwg bG9jYXRpb246KENHUG9pbnQpbG9jYXRpb24gdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgSUQ6KE5T U3RyaW5nICopSUQgcmVjdDooQ0dSZWN0KXJlY3QgaW1hZ2U6KFdlYktpdDo6U2hhcmVhYmxlQml0 bWFwKilpbWFnZSB1c2VySW5mbzooTlNEaWN0aW9uYXJ5ICopdXNlckluZm87CistIChpbnN0YW5j ZXR5cGUpX2luaXRXaXRoVHlwZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6KE5T VVJMICopdXJsIGltYWdlVVJMOihOU1VSTCAqKWltYWdlVVJMIGxvY2F0aW9uOihDR1BvaW50KWxv Y2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElEOihOU1N0cmluZyAqKUlEIHJlY3Q6KENH UmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcCopaW1hZ2U7CistIChpbnN0 YW5jZXR5cGUpX2luaXRXaXRoVHlwZTooX1dLQWN0aXZhdGVkRWxlbWVudFR5cGUpdHlwZSBVUkw6 KE5TVVJMICopdXJsIGltYWdlVVJMOihOU1VSTCAqKWltYWdlVVJMIGxvY2F0aW9uOihDR1BvaW50 KWxvY2F0aW9uIHRpdGxlOihOU1N0cmluZyAqKXRpdGxlIElEOihOU1N0cmluZyAqKUlEIHJlY3Q6 KENHUmVjdClyZWN0IGltYWdlOihXZWJLaXQ6OlNoYXJlYWJsZUJpdG1hcCopaW1hZ2UgdXNlcklu Zm86KE5TRGljdGlvbmFyeSAqKXVzZXJJbmZvOwogCiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVh ZG9ubHkpIENHUG9pbnQgX2ludGVyYWN0aW9uTG9jYXRpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tFbGVtZW50QWN0aW9uLm1tIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0KaW5kZXggM2M1 MTBmNDMwMDJmOGM1YzllNjAyZmU4ZDNhYjhiMTQyOGYyZDU4YS4uMDJkMjE4NTQwNzYxNDFkNGQ3 ODRmZTlkOTlhMWNkYjg1MWRjOWZiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS0VsZW1lbnRBY3Rpb24ubW0KQEAgLTEyOSw3ICsxMjksNyBAQCAr IChpbnN0YW5jZXR5cGUpX2VsZW1lbnRBY3Rpb25XaXRoVHlwZTooX1dLRWxlbWVudEFjdGlvblR5 cGUpdHlwZSBjdXN0b21UaXRsZTooTgogICAgIGNhc2UgX1dLRWxlbWVudEFjdGlvblR5cGVTaGFy ZToKICAgICAgICAgdGl0bGUgPSBXRUJfVUlfU1RSSU5HKCJTaGFyZeKApiIsICJUaXRsZSBmb3Ig U2hhcmUgYWN0aW9uIGJ1dHRvbiIpOwogICAgICAgICBoYW5kbGVyID0gXihXS0FjdGlvblNoZWV0 QXNzaXN0YW50ICphc3Npc3RhbnQsIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICphY3Rpb25JbmZv KSB7Ci0gICAgICAgICAgICBbYXNzaXN0YW50LmRlbGVnYXRlIGFjdGlvblNoZWV0QXNzaXN0YW50 OmFzc2lzdGFudCBzaGFyZUVsZW1lbnRXaXRoVVJMOmFjdGlvbkluZm8uVVJMIHJlY3Q6YWN0aW9u SW5mby5ib3VuZGluZ1JlY3RdOworICAgICAgICAgICAgW2Fzc2lzdGFudC5kZWxlZ2F0ZSBhY3Rp b25TaGVldEFzc2lzdGFudDphc3Npc3RhbnQgc2hhcmVFbGVtZW50V2l0aFVSTDphY3Rpb25JbmZv LlVSTCA/OiBhY3Rpb25JbmZvLmltYWdlVVJMIHJlY3Q6YWN0aW9uSW5mby5ib3VuZGluZ1JlY3Rd OwogICAgICAgICB9OwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0gYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQppbmRl eCBmNzNiODY3M2E4NDk1OTRjNTM0MzI4NmVjZjk2NzMzZWY0ZGQ2ZTY2Li45ZjRlZDkyZTYxMzM0 NTdhN2NmYmIyMTE2ODkwZmZiMTU4MTBiNWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQpAQCAtMzkyLDEwICszOTIs MTEgQEAgLSAodm9pZClzaG93SW1hZ2VTaGVldAogCiAgICAgdm9pZCAoXnNob3dJbWFnZVNoZWV0 V2l0aEFsdGVybmF0ZVVSTEJsb2NrKShOU1VSTCosIE5TRGljdGlvbmFyeSAqdXNlckluZm8pID0g XihOU1VSTCAqYWx0ZXJuYXRlVVJMLCBOU0RpY3Rpb25hcnkgKnVzZXJJbmZvKSB7CiAgICAgICAg IE5TVVJMICp0YXJnZXRVUkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi0+dXJsOworICAgICAgICBO U1VSTCAqaW1hZ2VVUkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi0+aW1hZ2VVUkw7CiAgICAgICAg IGlmICghdGFyZ2V0VVJMKQogICAgICAgICAgICAgdGFyZ2V0VVJMID0gYWx0ZXJuYXRlVVJMOwog ICAgICAgICBhdXRvIGVsZW1lbnRCb3VuZHMgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi0+Ym91bmRz OwotICAgICAgICBhdXRvIGVsZW1lbnRJbmZvID0gYWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1l bnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBlOl9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlSW1hZ2Ug VVJMOnRhcmdldFVSTCBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1hdGlvbi0+cmVxdWVzdC5wb2lu dCB0aXRsZTpfcG9zaXRpb25JbmZvcm1hdGlvbi0+dGl0bGUgSUQ6X3Bvc2l0aW9uSW5mb3JtYXRp b24tPmlkQXR0cmlidXRlIHJlY3Q6ZWxlbWVudEJvdW5kcyBpbWFnZTpfcG9zaXRpb25JbmZvcm1h dGlvbi0+aW1hZ2UuZ2V0KCkgdXNlckluZm86dXNlckluZm9dKTsKKyAgICAgICAgYXV0byBlbGVt ZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRX aXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUltYWdlIFVSTDp0YXJnZXRVUkwgaW1hZ2VV Ukw6aW1hZ2VVUkwgbG9jYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnJlcXVlc3QucG9pbnQg dGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0aW9u LT5pZEF0dHJpYnV0ZSByZWN0OmVsZW1lbnRCb3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRp b24tPmltYWdlLmdldCgpIHVzZXJJbmZvOnVzZXJJbmZvXSk7CiAgICAgICAgIGlmIChbZGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihhY3Rpb25TaGVldEFzc2lzdGFudDpzaG93 Q3VzdG9tU2hlZXRGb3JFbGVtZW50OildICYmIFtkZWxlZ2F0ZSBhY3Rpb25TaGVldEFzc2lzdGFu dDpzZWxmIHNob3dDdXN0b21TaGVldEZvckVsZW1lbnQ6ZWxlbWVudEluZm8uZ2V0KCldKQogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICBhdXRvIGRlZmF1bHRBY3Rpb25zID0gW3NlbGYgZGVm YXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0OmVsZW1lbnRJbmZvLmdldCgpXTsKQEAgLTUzNiw3ICs1 MzcsOCBAQCAtIChSZXRhaW5QdHI8TlNBcnJheT4pZGVmYXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0 OihfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVsZQogICAgIGlmICh0YXJnZXRVUkwpIHsKICAg ICAgICAgW3NlbGYgX2FwcGVuZE9wZW5BY3Rpb25zRm9yVVJMOnRhcmdldFVSTCBhY3Rpb25zOmRl ZmF1bHRBY3Rpb25zLmdldCgpIGVsZW1lbnRJbmZvOmVsZW1lbnRJbmZvXTsKICAgICAgICAgW2Rl ZmF1bHRBY3Rpb25zIGFkZE9iamVjdDpbX1dLRWxlbWVudEFjdGlvbiBfZWxlbWVudEFjdGlvbldp dGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBlU2hhcmUgYXNzaXN0YW50OnNlbGZdXTsKLSAgICB9 CisgICAgfSBlbHNlIGlmIChbZWxlbWVudEluZm8gaW1hZ2VVUkxdKQorICAgICAgICBbZGVmYXVs dEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5 cGU6X1dLRWxlbWVudEFjdGlvblR5cGVTaGFyZSBhc3Npc3RhbnQ6c2VsZl1dOwogCiAjaWYgSEFW RShTQUZBUklfU0VSVklDRVNfRlJBTUVXT1JLKQogICAgIGlmIChbZ2V0U1NSZWFkaW5nTGlzdENs YXNzKCkgc3VwcG9ydHNVUkw6dGFyZ2V0VVJMXSkKQEAgLTU3MSw3ICs1NzMsNyBAQCAtICh2b2lk KXNob3dMaW5rU2hlZXQKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGF1dG8gZWxlbWVu dEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0 aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVMaW5rIFVSTDp0YXJnZXRVUkwgbG9jYXRpb246 X3Bvc2l0aW9uSW5mb3JtYXRpb24tPnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3Jt YXRpb24tPnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0aW9uLT5pZEF0dHJpYnV0ZSByZWN0Ol9w b3NpdGlvbkluZm9ybWF0aW9uLT5ib3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24tPmlt YWdlLmdldCgpXSk7CisgICAgYXV0byBlbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0 ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlw ZUxpbmsgVVJMOnRhcmdldFVSTCBpbWFnZVVSTDooTlNVUkwqKV9wb3NpdGlvbkluZm9ybWF0aW9u LT5pbWFnZVVSTCBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1hdGlvbi0+cmVxdWVzdC5wb2ludCB0 aXRsZTpfcG9zaXRpb25JbmZvcm1hdGlvbi0+dGl0bGUgSUQ6X3Bvc2l0aW9uSW5mb3JtYXRpb24t PmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24tPmJvdW5kcyBpbWFnZTpfcG9z aXRpb25JbmZvcm1hdGlvbi0+aW1hZ2UuZ2V0KCldKTsKICAgICBpZiAoW19kZWxlZ2F0ZSByZXNw b25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGFjdGlvblNoZWV0QXNzaXN0YW50OnNob3dDdXN0b21T aGVldEZvckVsZW1lbnQ6KV0gJiYgW19kZWxlZ2F0ZSBhY3Rpb25TaGVldEFzc2lzdGFudDpzZWxm IHNob3dDdXN0b21TaGVldEZvckVsZW1lbnQ6ZWxlbWVudEluZm8uZ2V0KCldKSB7CiAgICAgICAg IF9uZWVkc0xpbmtJbmRpY2F0b3IgPSBOTzsKICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K aW5kZXggODRlNzMxZmM0MmQzNjk3NWQwNzk0M2FhYzkxNDBmMjAyYjBmMDkwMS4uNzQzOTIwNGRh YjM3NjY3NmQxZmY2ZWUwMGM2NzE5NjJiM2NmMjk2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC0xNzkx LDcgKzE3OTEsNyBAQCAtICh2b2lkKV9zaG93QXR0YWNobWVudFNoZWV0CiAgICAgaWYgKCFbdWlE ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OnNob3dDdXN0b21T aGVldEZvckVsZW1lbnQ6KV0pCiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8gZWxlbWVudCA9 IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpf V0tBY3RpdmF0ZWRFbGVtZW50VHlwZUF0dGFjaG1lbnQgVVJMOihOU1VSTCAqKV9wb3NpdGlvbklu Zm9ybWF0aW9uLnVybCBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1hdGlvbi5yZXF1ZXN0LnBvaW50 IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0aW9u LmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzIGltYWdlOm5pbF0p OworICAgIGF1dG8gZWxlbWVudCA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBh bGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUF0dGFjaG1lbnQgVVJM OihOU1VSTCAqKV9wb3NpdGlvbkluZm9ybWF0aW9uLnVybCBpbWFnZVVSTDooTlNVUkwgKilfcG9z aXRpb25JbmZvcm1hdGlvbi5pbWFnZVVSTCBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1hdGlvbi5y ZXF1ZXN0LnBvaW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIElEOl9wb3NpdGlv bkluZm9ybWF0aW9uLmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRz IGltYWdlOm5pbF0pOwogICAgIFt1aURlbGVnYXRlIF93ZWJWaWV3Ol93ZWJWaWV3IHNob3dDdXN0 b21TaGVldEZvckVsZW1lbnQ6ZWxlbWVudC5nZXQoKV07CiB9CiAKQEAgLTcyNDMsNyArNzI0Myw3 IEBAIC0gKE5TRGljdGlvbmFyeSAqKV9kYXRhRm9yUHJldmlld0l0ZW1Db250cm9sbGVyOihVSVBy ZXZpZXdJdGVtQ29udHJvbGxlciAqKWNvbnRyCiAgICAgICAgIGRhdGFGb3JQcmV2aWV3W1VJUHJl dmlld0RhdGFMaW5rXSA9IChOU1VSTCAqKV9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlVVJMOwog ICAgIH0gZWxzZSBpZiAoY2FuU2hvd0F0dGFjaG1lbnRQcmV2aWV3KSB7CiAgICAgICAgICp0eXBl ID0gVUlQcmV2aWV3SXRlbVR5cGVBdHRhY2htZW50OwotICAgICAgICBhdXRvIGVsZW1lbnQgPSBh ZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dL QWN0aXZhdGVkRWxlbWVudFR5cGVBdHRhY2htZW50IFVSTDooTlNVUkwgKilsaW5rVVJMIGxvY2F0 aW9uOl9wb3NpdGlvbkluZm9ybWF0aW9uLnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5m b3JtYXRpb24udGl0bGUgSUQ6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaWRBdHRyaWJ1dGUgcmVjdDpf cG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHMgaW1hZ2U6bmlsXSk7CisgICAgICAgIGF1dG8gZWxl bWVudCA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRo VHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUF0dGFjaG1lbnQgVVJMOihOU1VSTCAqKWxpbmtV UkwgaW1hZ2VVUkw6KE5TVVJMICopX3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2VVUkwgbG9jYXRp b246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpfcG9zaXRpb25JbmZv cm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJpYnV0ZSByZWN0Ol9w b3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpuaWxdKTsKICAgICAgICAgTlNVSW50ZWdl ciBpbmRleCA9IFt1aURlbGVnYXRlIF93ZWJWaWV3Ol93ZWJWaWV3IGluZGV4SW50b0F0dGFjaG1l bnRMaXN0Rm9yRWxlbWVudDplbGVtZW50LmdldCgpXTsKICAgICAgICAgaWYgKGluZGV4ICE9IE5T Tm90Rm91bmQpIHsKICAgICAgICAgICAgIEJPT0wgc291cmNlSXNNYW5hZ2VkID0gTk87CkBAIC03 MzA1LDcgKzczMDUsNyBAQCAtIChVSVZpZXdDb250cm9sbGVyICopX3ByZXNlbnRlZFZpZXdDb250 cm9sbGVyRm9yUHJldmlld0l0ZW1Db250cm9sbGVyOihVSVByZXZpZQogCiAgICAgICAgIC8vIFRy ZWF0IGFuaW1hdGVkIGltYWdlcyBsaWtlIGEgbGluayBwcmV2aWV3CiAgICAgICAgIGlmIChpc1Zh bGlkVVJMRm9ySW1hZ2VQcmV2aWV3ICYmIF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzQW5pbWF0ZWRJ bWFnZSkgewotICAgICAgICAgICAgUmV0YWluUHRyPF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvPiBh bmltYXRlZEltYWdlRWxlbWVudEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudElu Zm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVJbWFnZSBVUkw6 dGFyZ2V0VVJMIGxvY2F0aW9uOl9wb3NpdGlvbkluZm9ybWF0aW9uLnJlcXVlc3QucG9pbnQgdGl0 bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUgSUQ6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaWRB dHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHMgaW1hZ2U6X3Bvc2l0aW9u SW5mb3JtYXRpb24uaW1hZ2UuZ2V0KCldKTsKKyAgICAgICAgICAgIFJldGFpblB0cjxfV0tBY3Rp dmF0ZWRFbGVtZW50SW5mbz4gYW5pbWF0ZWRJbWFnZUVsZW1lbnRJbmZvID0gYWRvcHROUyhbW19X S0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBlOl9XS0FjdGl2YXRlZEVs ZW1lbnRUeXBlSW1hZ2UgVVJMOnRhcmdldFVSTCBpbWFnZVVSTDpuaWwgbG9jYXRpb246X3Bvc2l0 aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpfcG9zaXRpb25JbmZvcm1hdGlvbi50 aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJpYnV0ZSByZWN0Ol9wb3NpdGlvbklu Zm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpfcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZS5nZXQoKV0p OwogCiAgICAgICAgICAgICBpZiAoW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcihfd2ViVmlldzpwcmV2aWV3Vmlld0NvbnRyb2xsZXJGb3JBbmltYXRlZEltYWdlQXRVUkw6 ZGVmYXVsdEFjdGlvbnM6ZWxlbWVudEluZm86aW1hZ2VTaXplOildKSB7CiAgICAgICAgICAgICAg ICAgUmV0YWluUHRyPE5TQXJyYXk+IGFjdGlvbnMgPSBbX2FjdGlvblNoZWV0QXNzaXN0YW50IGRl ZmF1bHRBY3Rpb25zRm9ySW1hZ2VTaGVldDphbmltYXRlZEltYWdlRWxlbWVudEluZm8uZ2V0KCld OwpAQCAtNzMxMyw3ICs3MzEzLDcgQEAgLSAoVUlWaWV3Q29udHJvbGxlciAqKV9wcmVzZW50ZWRW aWV3Q29udHJvbGxlckZvclByZXZpZXdJdGVtQ29udHJvbGxlcjooVUlQcmV2aWUKICAgICAgICAg ICAgIH0KICAgICAgICAgfQogCi0gICAgICAgIFJldGFpblB0cjxfV0tBY3RpdmF0ZWRFbGVtZW50 SW5mbz4gZWxlbWVudEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxs b2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVMaW5rIFVSTDp0YXJnZXRV UkwgbG9jYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpfcG9z aXRpb25JbmZvcm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJpYnV0 ZSByZWN0Ol9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpfcG9zaXRpb25JbmZvcm1h dGlvbi5pbWFnZS5nZXQoKV0pOworICAgICAgICBSZXRhaW5QdHI8X1dLQWN0aXZhdGVkRWxlbWVu dEluZm8+IGVsZW1lbnRJbmZvID0gYWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFs bG9jXSBfaW5pdFdpdGhUeXBlOl9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlTGluayBVUkw6dGFyZ2V0 VVJMIGltYWdlVVJMOm5pbCBsb2NhdGlvbjpfcG9zaXRpb25JbmZvcm1hdGlvbi5yZXF1ZXN0LnBv aW50IHRpdGxlOl9wb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIElEOl9wb3NpdGlvbkluZm9ybWF0 aW9uLmlkQXR0cmlidXRlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzIGltYWdlOl9w b3NpdGlvbkluZm9ybWF0aW9uLmltYWdlLmdldCgpXSk7CiAKICAgICAgICAgYXV0byBhY3Rpb25z ID0gW19hY3Rpb25TaGVldEFzc2lzdGFudCBkZWZhdWx0QWN0aW9uc0ZvckxpbmtTaGVldDplbGVt ZW50SW5mby5nZXQoKV07CiAgICAgICAgIGlmIChbdWlEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKHdlYlZpZXc6cHJldmlld2luZ1ZpZXdDb250cm9sbGVyRm9yRWxlbWVudDpk ZWZhdWx0QWN0aW9uczopXSkgewpAQCAtNzM1MSw3ICs3MzUxLDcgQEAgLSAoVUlWaWV3Q29udHJv bGxlciAqKV9wcmVzZW50ZWRWaWV3Q29udHJvbGxlckZvclByZXZpZXdJdGVtQ29udHJvbGxlcjoo VUlQcmV2aWUKICAgICAgICAgICAgIGltYWdlSW5mbyA9IHVzZXJJbmZvOwogICAgICAgICB9CiAK LSAgICAgICAgUmV0YWluUHRyPF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvPiBlbGVtZW50SW5mbyA9 IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpf V0tBY3RpdmF0ZWRFbGVtZW50VHlwZUltYWdlIFVSTDphbHRlcm5hdGVVUkwuZ2V0KCkgbG9jYXRp b246X3Bvc2l0aW9uSW5mb3JtYXRpb24ucmVxdWVzdC5wb2ludCB0aXRsZTpfcG9zaXRpb25JbmZv cm1hdGlvbi50aXRsZSBJRDpfcG9zaXRpb25JbmZvcm1hdGlvbi5pZEF0dHJpYnV0ZSByZWN0Ol9w b3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpfcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFn ZS5nZXQoKSB1c2VySW5mbzppbWFnZUluZm8uZ2V0KCldKTsKKyAgICAgICAgUmV0YWluUHRyPF9X S0FjdGl2YXRlZEVsZW1lbnRJbmZvPiBlbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0 ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlw ZUltYWdlIFVSTDphbHRlcm5hdGVVUkwuZ2V0KCkgaW1hZ2VVUkw6bmlsIGxvY2F0aW9uOl9wb3Np dGlvbkluZm9ybWF0aW9uLnJlcXVlc3QucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24u dGl0bGUgSUQ6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaWRBdHRyaWJ1dGUgcmVjdDpfcG9zaXRpb25J bmZvcm1hdGlvbi5ib3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2UuZ2V0KCkg dXNlckluZm86aW1hZ2VJbmZvLmdldCgpXSk7CiAgICAgICAgIF9wYWdlLT5zdGFydEludGVyYWN0 aW9uV2l0aEVsZW1lbnRBdFBvc2l0aW9uKF9wb3NpdGlvbkluZm9ybWF0aW9uLnJlcXVlc3QucG9p bnQpOwogCiAgICAgICAgIGlmIChbdWlEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKF93ZWJWaWV3OndpbGxQcmV2aWV3SW1hZ2VXaXRoVVJMOildKQpkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDhlY2ZlMTFjNmY1OGRhM2NjNTJl MmIzYjQ4MDljMmMyZWUyOWE4YzAuLjRiYWM1OGYxMTVmYmUzM2M1OGE3YmE2ZmU2Mjc1MmQxYWY1 MjZjM2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwxNiBAQAorMjAxOS0wNC0xNSAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRu ZXJAYXBwbGUuY29tPgorCisgICAgICAgIEFsbG93IHNoYXJpbmcgZnJvbSBpbWFnZVNoZWV0IG9u IGFuIGltYWdlIGRvY3VtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTY4OTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI1Mzc3Mzg2PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgdG8gbWFr ZSBzdXJlIHRoYXQgdGhlIGNvcnJlY3QgaW1hZ2VVUkwgaXMgZXh0cmFjdGVkIGZyb20gYW4gaW1h Z2UgZWxlbWVudC4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tSZXF1ZXN0QWN0aXZhdGVkRWxlbWVudEluZm8ubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpURVNUKToKKwogMjAxOS0wNC0xMCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3 ZWJraXQub3JnPgogCiAgICAgICAgIFdLTmF2aWdhdGlvblJlc3BvbnNlLl9kb3dubG9hZEF0dHJp YnV0ZSBzaG91bGQgYmUgbmlsIHdoZW4gbm8gZG93bmxvYWQgYXR0cmlidXRlIGlzIHByZXNlbnQK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tSZXF1 ZXN0QWN0aXZhdGVkRWxlbWVudEluZm8ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1dLUmVxdWVzdEFjdGl2YXRlZEVsZW1lbnRJbmZvLm1tCmluZGV4IDFhZWJlYTg4 ZWUxMjZlNzZmMWQ3ZWQ0ZTYwMjExYTMwOTU2ZjhmODcuLjk0MDYxZmM3NjVkOGNmZDdhOTk1YWVm YTZmODBmOWUyYzY4YzUzNTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvV0tSZXF1ZXN0QWN0aXZhdGVkRWxlbWVudEluZm8ubW0KKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1JlcXVlc3RBY3RpdmF0ZWRFbGVtZW50 SW5mby5tbQpAQCAtNzIsNiArNzIsMzAgQEAgVEVTVChXZWJLaXQsIFJlcXVlc3RBY3RpdmF0ZWRF bGVtZW50SW5mb0ZvckxpbmspCiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmaW5pc2hl ZCk7CiB9CiAgICAgCitURVNUKFdlYktpdCwgUmVxdWVzdEFjdGl2YXRlZEVsZW1lbnRJbmZvRm9y SW1hZ2UpCit7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCAyMTUsIDE3NCldKTsKKyAgICBOU1VS TFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltbTlNCdW5k bGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJpY29uIiB3aXRoRXh0ZW5zaW9uOkAicG5n IiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXTsKKyAgICBbd2ViVmll dyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKyAgICBbd2ViVmlldyBfdGVzdF93YWl0Rm9yRGlkRmlu aXNoTmF2aWdhdGlvbl07CisgICAgCisgICAgX19ibG9jayBib29sIGZpbmlzaGVkID0gZmFsc2U7 CisgICAgW3dlYlZpZXcgX3JlcXVlc3RBY3RpdmF0ZWRFbGVtZW50QXRQb3NpdGlvbjpDR1BvaW50 TWFrZSg1MCwgNTApIGNvbXBsZXRpb25CbG9jazogXihfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAq ZWxlbWVudEluZm8pIHsKKyAgICAgICAgCisgICAgICAgIEVYUEVDVF9UUlVFKGVsZW1lbnRJbmZv LnR5cGUgPT0gX1dLQWN0aXZhdGVkRWxlbWVudFR5cGVJbWFnZSk7CisgICAgICAgIEVYUEVDVF9X S19TVFJFUShlbGVtZW50SW5mby5pbWFnZVVSTC5sYXN0UGF0aENvbXBvbmVudCwgImljb24ucG5n Iik7CisgICAgICAgIEVYUEVDVF9OT1RfTlVMTChlbGVtZW50SW5mby5pbWFnZSk7CisgICAgICAg IEVYUEVDVF9FUShlbGVtZW50SW5mby5ib3VuZGluZ1JlY3Quc2l6ZS53aWR0aCwgMjE1KTsKKyAg ICAgICAgRVhQRUNUX0VRKGVsZW1lbnRJbmZvLmJvdW5kaW5nUmVjdC5zaXplLmhlaWdodCwgMTc0 KTsKKyAgICAgICAgRVhQRUNUX0VRKGVsZW1lbnRJbmZvLmltYWdlLnNpemUud2lkdGgsIDIxNSk7 CisgICAgICAgIEVYUEVDVF9FUShlbGVtZW50SW5mby5pbWFnZS5zaXplLmhlaWdodCwgMTc0KTsK KyAgICAgICAgCisgICAgICAgIGZpbmlzaGVkID0gdHJ1ZTsKKyAgICB9XTsKKyAgICAKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZpbmlzaGVkKTsKK30KKyAgICAKIFRFU1QoV2ViS2l0 LCBSZXF1ZXN0QWN0aXZhdGVkRWxlbWVudEluZm9Gb3JCbGFuaykKIHsKICAgICBhdXRvIHdlYlZp ZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RN YWtlKDAsIDAsIDMyMCwgNTAwKV0pOwo=