133902 2014-06-14 08:46:07 -0700 Use references instead of pointers to RenderBlock in RenderObject::enclosingBox(). 2014-06-16 12:52:56 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 je_julie.kim webkit-unassigned calvaris commit-queue eric.carlson esprehn+autocc glenn gyuyoung.kim jer.noble kondapallykalyan philipj sergio simon.fraser WebkitBugTracker oldest_to_newest 1015654 0 je_julie.kim 2014-06-14 08:46:07 -0700 Use references instead of pointers to RenderBlock for return type of RenderObject::enclosingBox(). Just a straightforward conversion from pointers to references. 1015655 1 233108 je_julie.kim 2014-06-14 08:54:30 -0700 Created attachment 233108 Patch 1015850 2 233156 je_julie.kim 2014-06-16 06:10:50 -0700 Created attachment 233156 verification on win-ews 1015864 3 je_julie.kim 2014-06-16 08:37:58 -0700 This patch is for removing "// FIXME: This should return a reference; it can always find the root RenderView." in RenderObject::enclosingBox(). Please take a look. Thanks, Jeongeun 1015937 4 233156 commit-queue 2014-06-16 12:52:51 -0700 Comment on attachment 233156 verification on win-ews Clearing flags on attachment: 233156 Committed r170024: <http://trac.webkit.org/changeset/170024> 1015938 5 commit-queue 2014-06-16 12:52:56 -0700 All reviewed patches have been landed. Closing bug. 233108 2014-06-14 08:54:30 -0700 2014-06-16 06:10:35 -0700 Patch bug-133902-20140615005405.patch text/plain 15453 je_julie.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5OTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQwYjdlNzJkZjA5MmM3 ZjBjNDBmODc1YzA1ODQ2ODRkNGE5OTVhZS4uOThkN2QzNGJiMjZmNDdkOTE2MjliMWEzYjhkZWEx MWJmMWY3MjMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA2LTE0ICBKZW9u Z2V1biBLaW0gIDxqZV9qdWxpZS5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHJlZmVy ZW5jZXMgaW5zdGVhZCBvZiBwb2ludGVycyB0byBSZW5kZXJCbG9jayBpbiBSZW5kZXJPYmplY3Q6 OmVuY2xvc2luZ0JveCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMzOTAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSnVzdCBhIHN0cmFpZ2h0Zm9yd2FyZCBjb252ZXJzaW9uIGZyb20gcG9pbnRlcnMg dG8gcmVmZXJlbmNlcy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5n ZS4KKworICAgICAgICAqIGJpbmRpbmdzL29iamMvRE9NVUlLaXRFeHRlbnNpb25zLm1tOgorICAg ICAgICAoLVtET01IVE1MRWxlbWVudCBzdHJ1Y3R1cmFsQ29tcGxleGl0eUNvbnRyaWJ1dGlvbl0p OgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3Rvck92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JS ZW5kZXJlckZyYWdtZW50cyk6CisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6c2Nyb2xsTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRs ZXI6OnNjcm9sbE92ZXJmbG93KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6bG9n aWNhbFNjcm9sbE92ZXJmbG93KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlSW5saW5lU3RhdGljRGlzdGFu Y2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmNvbXB1dGVkUmVnaW9uUmFuZ2VGb3JCb3gpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6b2JqZWN0U2hvdWxkRnJhZ21lbnRJ bkZsb3dSZWdpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6b2JqZWN0 SW5GbG93UmVnaW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJP YmplY3Q6OmVuY2xvc2luZ0JveCk6IFJlbW92ZWQgRklYTUUgY29tbWVudAorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyU2Nyb2xs YmFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNjcm9sbGJhcjo6b3duaW5nUmVuZGVy ZXIpOgorCiAyMDE0LTA2LTEyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgYWxsIGRlcHJlY2F0ZWQgQVBJIGZyb20gR09i amVjdCBET00gYmluZGluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL29i amMvRE9NVUlLaXRFeHRlbnNpb25zLm1tIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9E T01VSUtpdEV4dGVuc2lvbnMubW0KaW5kZXggMjlmZmY4NjkzOGNkZmRjZDk5MmFkMzRkZWM5MThk YTE4NTk3MjQ1Mi4uY2MwMmJjM2I5MTc5YjUxYmRmN2YyY2Q3OGY4M2IxYWIzNjU3NGRiOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01VSUtpdEV4dGVuc2lvbnMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01VSUtpdEV4dGVuc2lvbnMu bW0KQEAgLTM0OSwxMCArMzQ5LDEwIEBAIC0gKGludClzdHJ1Y3R1cmFsQ29tcGxleGl0eUNvbnRy aWJ1dGlvbgogICAgICAgICB9IGVsc2UgaWYgKHJlbmRlcmVyLT5pc1JlbmRlckJsb2NrRmxvdygp IHx8IChyZW5kZXJlci0+aXNSZW5kZXJCbG9jaygpICYmIHRvUmVuZGVyQmxvY2socmVuZGVyZXIp LT5pbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCkgIT0gMCkpIHsKICAgICAgICAgICAgIEJPT0wg bm9Db3N0ID0gTk87CiAgICAgICAgICAgICBpZiAocmVuZGVyZXItPmlzQm94KCkpIHsKLSAgICAg ICAgICAgICAgICBSZW5kZXJCb3ggKmFzQm94ID0gcmVuZGVyZXItPmVuY2xvc2luZ0JveCgpOwot ICAgICAgICAgICAgICAgIFJlbmRlck9iamVjdCAqcGFyZW50ID0gYXNCb3gtPnBhcmVudCgpOwor ICAgICAgICAgICAgICAgIFJlbmRlckJveCAmYXNCb3ggPSByZW5kZXJlci0+ZW5jbG9zaW5nQm94 KCk7CisgICAgICAgICAgICAgICAgUmVuZGVyT2JqZWN0ICpwYXJlbnQgPSBhc0JveC5wYXJlbnQo KTsKICAgICAgICAgICAgICAgICBSZW5kZXJCb3ggKnBhcmVudFJlbmRlckJveCA9IChwYXJlbnQg JiYgcGFyZW50LT5pc0JveCgpKSA/IHRvUmVuZGVyQm94KHBhcmVudCkgOiAwOwotICAgICAgICAg ICAgICAgIGlmIChwYXJlbnRSZW5kZXJCb3ggJiYgYXNCb3ggJiYgYXNCb3gtPndpZHRoKCkgPT0g cGFyZW50UmVuZGVyQm94LT53aWR0aCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKHBhcmVudFJl bmRlckJveCAmJiBhc0JveC53aWR0aCgpID09IHBhcmVudFJlbmRlckJveC0+d2lkdGgoKSkgewog ICAgICAgICAgICAgICAgICAgICBub0Nvc3QgPSBZRVM7CiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXgg ZDdmMWJhNjRmMjUwMTdjNmM0YmE3ZTkyNjNiZTFhMDM5MDJkM2VhMC4uNDczYTIyNWYzNzc5OTVh OTAyNTI2NWM3NDcyNzdkODllOTQ4MGNlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCkBAIC01NjExLDcgKzU2MTEsNyBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6 Om1lZGlhUGxheWVySXNWaWRlbygpIGNvbnN0CiBMYXlvdXRSZWN0IEhUTUxNZWRpYUVsZW1lbnQ6 Om1lZGlhUGxheWVyQ29udGVudEJveFJlY3QoKSBjb25zdAogewogICAgIGlmIChyZW5kZXJlcigp KQotICAgICAgICByZXR1cm4gcmVuZGVyZXIoKS0+ZW5jbG9zaW5nQm94KCktPmNvbnRlbnRCb3hS ZWN0KCk7CisgICAgICAgIHJldHVybiByZW5kZXJlcigpLT5lbmNsb3NpbmdCb3goKS5jb250ZW50 Qm94UmVjdCgpOwogICAgIHJldHVybiBMYXlvdXRSZWN0KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAppbmRleCAwMWQxNjcxZmY0YzEzZDNm MGZmYjNlMGM5MDFjMTQ0NzA2YWE5YzAxLi40MTQxYjcxMjZmZGJmZmZkN2NlMWY2MGZiNThmODRl MDlmMWZjNWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y T3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJs YXkuY3BwCkBAIC01MTEsMTAgKzUxMSw5IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvckFy cmF5PiBidWlsZE9iamVjdEZvclJlbmRlcmVyRnJhZ21lbnRzKFJlbmRlck9iamVjdCoKICAgICAg ICAgYnVpbGRSZW5kZXJlckhpZ2hsaWdodChyZW5kZXJlciwgbnVsbHB0ciwgY29uZmlnLCAmaGln aGxpZ2h0KTsKICAgICAgICAgZnJhZ21lbnRzQXJyYXktPnB1c2hPYmplY3QoYnVpbGRPYmplY3RG b3JIaWdobGlnaHQoaGlnaGxpZ2h0KSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgUmVuZGVyQm94 KiBlbmNsb3NpbmdCb3ggPSByZW5kZXJlci0+ZW5jbG9zaW5nQm94KCk7CiAgICAgICAgIFJlbmRl clJlZ2lvbiogc3RhcnRSZWdpb24gPSBudWxscHRyOwogICAgICAgICBSZW5kZXJSZWdpb24qIGVu ZFJlZ2lvbiA9IG51bGxwdHI7Ci0gICAgICAgIGlmICghY29udGFpbmluZ0Zsb3dUaHJlYWQtPmdl dFJlZ2lvblJhbmdlRm9yQm94KGVuY2xvc2luZ0JveCwgc3RhcnRSZWdpb24sIGVuZFJlZ2lvbikp IHsKKyAgICAgICAgaWYgKCFjb250YWluaW5nRmxvd1RocmVhZC0+Z2V0UmVnaW9uUmFuZ2VGb3JC b3goJnJlbmRlcmVyLT5lbmNsb3NpbmdCb3goKSwgc3RhcnRSZWdpb24sIGVuZFJlZ2lvbikpIHsK ICAgICAgICAgICAgIC8vIFRoZSBmbG93IGhhcyBubyB2aXNpYmxlIHJlZ2lvbnMuIFRoZSByZW5k ZXJlciBpcyBub3QgdmlzaWJsZSBvbiBzY3JlZW4uCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDg3MzEy Yjc5ZmQwMDBmNWRhZTMzNDdlYjU4N2FjZmIxOGQ1OTU1NDEuLjhlMDY4MDRiOTZlYjNlZGRjOTNl M2U2ZmM4ODA4ZGFlNGZjZTAxYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAK QEAgLTI4OSwxMCArMjg5LDEwIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBzY3JvbGxOb2RlKGZsb2F0 IGRlbHRhLCBTY3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0eSwgU2Nyb2xsCiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICBpZiAoIW5vZGUtPnJlbmRlcmVyKCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICBSZW5kZXJCb3gqIGVuY2xvc2luZ0JveCA9IG5vZGUtPnJlbmRlcmVyKCktPmVu Y2xvc2luZ0JveCgpOworICAgIFJlbmRlckJveCYgZW5jbG9zaW5nQm94ID0gbm9kZS0+cmVuZGVy ZXIoKS0+ZW5jbG9zaW5nQm94KCk7CiAgICAgZmxvYXQgYWJzRGVsdGEgPSBkZWx0YSA+IDAgPyBk ZWx0YSA6IC1kZWx0YTsKIAotICAgIHJldHVybiBlbmNsb3NpbmdCb3gtPnNjcm9sbChkZWx0YSA8 IDAgPyBuZWdhdGl2ZURpcmVjdGlvbiA6IHBvc2l0aXZlRGlyZWN0aW9uLCBncmFudWxhcml0eSwg YWJzRGVsdGEsIHN0b3BFbGVtZW50LCBlbmNsb3NpbmdCb3gsIHdoZWVsRXZlbnRBYnNvbHV0ZVBv aW50KTsKKyAgICByZXR1cm4gZW5jbG9zaW5nQm94LnNjcm9sbChkZWx0YSA8IDAgPyBuZWdhdGl2 ZURpcmVjdGlvbiA6IHBvc2l0aXZlRGlyZWN0aW9uLCBncmFudWxhcml0eSwgYWJzRGVsdGEsIHN0 b3BFbGVtZW50LCAmZW5jbG9zaW5nQm94LCB3aGVlbEV2ZW50QWJzb2x1dGVQb2ludCk7CiB9CiAK ICNpZiAoRU5BQkxFKFRPVUNIX0VWRU5UUykgJiYgIVBMQVRGT1JNKElPUykpCkBAIC0xMTA2LDcg KzExMDYsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6c2Nyb2xsT3ZlcmZsb3coU2Nyb2xsRGlyZWN0 aW9uIGRpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHkgZwogICAgIAogICAgIGlmIChub2RlKSB7 CiAgICAgICAgIGF1dG8gciA9IG5vZGUtPnJlbmRlcmVyKCk7Ci0gICAgICAgIGlmIChyICYmICFy LT5pc0xpc3RCb3goKSAmJiByLT5lbmNsb3NpbmdCb3goKS0+c2Nyb2xsKGRpcmVjdGlvbiwgZ3Jh bnVsYXJpdHkpKSB7CisgICAgICAgIGlmIChyICYmICFyLT5pc0xpc3RCb3goKSAmJiByLT5lbmNs b3NpbmdCb3goKS5zY3JvbGwoZGlyZWN0aW9uLCBncmFudWxhcml0eSkpIHsKICAgICAgICAgICAg IHNldEZyYW1lV2FzU2Nyb2xsZWRCeVVzZXIoKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICB9CkBAIC0xMTI3LDcgKzExMjcsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6bG9naWNh bFNjcm9sbE92ZXJmbG93KFNjcm9sbExvZ2ljYWxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbAog ICAgIAogICAgIGlmIChub2RlKSB7CiAgICAgICAgIGF1dG8gciA9IG5vZGUtPnJlbmRlcmVyKCk7 Ci0gICAgICAgIGlmIChyICYmICFyLT5pc0xpc3RCb3goKSAmJiByLT5lbmNsb3NpbmdCb3goKS0+ bG9naWNhbFNjcm9sbChkaXJlY3Rpb24sIGdyYW51bGFyaXR5KSkgeworICAgICAgICBpZiAociAm JiAhci0+aXNMaXN0Qm94KCkgJiYgci0+ZW5jbG9zaW5nQm94KCkubG9naWNhbFNjcm9sbChkaXJl Y3Rpb24sIGdyYW51bGFyaXR5KSkgewogICAgICAgICAgICAgc2V0RnJhbWVXYXNTY3JvbGxlZEJ5 VXNlcigpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcAppbmRleCA3ZDdmZTc0NmMzNjhhOGEzZmE0NWQ2OWY0NzFkMjAxNmU0NDJm NWY4Li5kYWViNGQ2ZmIwOWJmYTc3NGMwM2ViYTcwNDU2MDI3MmQwNWY0MWVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0xMTg5LDcgKzExODksNyBAQCB2b2lkIEZyYW1lVmlldzo6 bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogICAgICAgICAgICAgICAgIGlmIChib2R5LT5oYXNU YWdOYW1lKGZyYW1lc2V0VGFnKSAmJiAhZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7CiAgICAg ICAgICAgICAgICAgICAgIGJvZHktPnJlbmRlcmVyKCktPnNldENoaWxkTmVlZHNMYXlvdXQoKTsK ICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05hbWUoYm9keVRhZykpIHsK LSAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0ICYmIG1fc2l6ZS5oZWlnaHQo KSAhPSBsYXlvdXRIZWlnaHQoKSAmJiBib2R5LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdCb3goKS0+ c3RyZXRjaGVzVG9WaWV3cG9ydCgpKQorICAgICAgICAgICAgICAgICAgICBpZiAoIW1fZmlyc3RM YXlvdXQgJiYgbV9zaXplLmhlaWdodCgpICE9IGxheW91dEhlaWdodCgpICYmIGJvZHktPnJlbmRl cmVyKCktPmVuY2xvc2luZ0JveCgpLnN0cmV0Y2hlc1RvVmlld3BvcnQoKSkKICAgICAgICAgICAg ICAgICAgICAgICAgIGJvZHktPnJlbmRlcmVyKCktPnNldENoaWxkTmVlZHNMYXlvdXQoKTsKICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCmluZGV4IDNmNmQxYWM0ZWRiMmFmYTMyMzI1ZTQ3NGQ3MTQ3OTMzMTRhYmFhZmQu LmRkNzY4NWM1MzUxMjVkZjRiMmRlODNiOWFmMmE2ZDVlNzNmYmYyYmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0zMTYzLDE0ICszMTYzLDE0IEBAIHN0YXRpYyB2 b2lkIGNvbXB1dGVJbmxpbmVTdGF0aWNEaXN0YW5jZShMZW5ndGgmIGxvZ2ljYWxMZWZ0LCBMZW5n dGgmIGxvZ2ljYWxSaWdoCiAgICAgICAgIH0KICAgICAgICAgbG9naWNhbExlZnQuc2V0VmFsdWUo Rml4ZWQsIHN0YXRpY1Bvc2l0aW9uKTsKICAgICB9IGVsc2UgewotICAgICAgICBSZW5kZXJCb3gq IGVuY2xvc2luZ0JveCA9IGNoaWxkLT5wYXJlbnQoKS0+ZW5jbG9zaW5nQm94KCk7CisgICAgICAg IFJlbmRlckJveCYgZW5jbG9zaW5nQm94ID0gY2hpbGQtPnBhcmVudCgpLT5lbmNsb3NpbmdCb3go KTsKICAgICAgICAgTGF5b3V0VW5pdCBzdGF0aWNQb3NpdGlvbiA9IGNoaWxkLT5sYXllcigpLT5z dGF0aWNJbmxpbmVQb3NpdGlvbigpICsgY29udGFpbmVyTG9naWNhbFdpZHRoICsgY29udGFpbmVy QmxvY2stPmJvcmRlckxvZ2ljYWxMZWZ0KCk7Ci0gICAgICAgIGZvciAoUmVuZGVyRWxlbWVudCog Y3VyciA9IGVuY2xvc2luZ0JveDsgY3VycjsgY3VyciA9IGN1cnItPmNvbnRhaW5lcigpKSB7Cisg ICAgICAgIGZvciAoUmVuZGVyRWxlbWVudCogY3VyciA9ICZlbmNsb3NpbmdCb3g7IGN1cnI7IGN1 cnIgPSBjdXJyLT5jb250YWluZXIoKSkgewogICAgICAgICAgICAgaWYgKGN1cnItPmlzQm94KCkp IHsKICAgICAgICAgICAgICAgICBpZiAoY3VyciAhPSBjb250YWluZXJCbG9jaykKICAgICAgICAg ICAgICAgICAgICAgc3RhdGljUG9zaXRpb24gLT0gdG9SZW5kZXJCb3goY3VyciktPmxvZ2ljYWxM ZWZ0KCk7Ci0gICAgICAgICAgICAgICAgaWYgKGN1cnIgPT0gZW5jbG9zaW5nQm94KQotICAgICAg ICAgICAgICAgICAgICBzdGF0aWNQb3NpdGlvbiAtPSBlbmNsb3NpbmdCb3gtPmxvZ2ljYWxXaWR0 aCgpOworICAgICAgICAgICAgICAgIGlmIChjdXJyID09ICZlbmNsb3NpbmdCb3gpCisgICAgICAg ICAgICAgICAgICAgIHN0YXRpY1Bvc2l0aW9uIC09IGVuY2xvc2luZ0JveC5sb2dpY2FsV2lkdGgo KTsKICAgICAgICAgICAgICAgICBpZiAocmVnaW9uICYmIGN1cnItPmlzUmVuZGVyQmxvY2soKSkg ewogICAgICAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJCbG9jayogY2IgPSB0b1JlbmRlckJs b2NrKGN1cnIpOwogICAgICAgICAgICAgICAgICAgICByZWdpb24gPSBjYi0+Y2xhbXBUb1N0YXJ0 QW5kRW5kUmVnaW9ucyhyZWdpb24pOwpAQCAtMzE3OCw4ICszMTc4LDggQEAgc3RhdGljIHZvaWQg Y29tcHV0ZUlubGluZVN0YXRpY0Rpc3RhbmNlKExlbmd0aCYgbG9naWNhbExlZnQsIExlbmd0aCYg bG9naWNhbFJpZ2gKICAgICAgICAgICAgICAgICAgICAgaWYgKGJveEluZm8pIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIGlmIChjdXJyICE9IGNvbnRhaW5lckJsb2NrKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXRpY1Bvc2l0aW9uIC09IGNiLT5sb2dpY2FsV2lkdGgoKSAtIChi b3hJbmZvLT5sb2dpY2FsTGVmdCgpICsgYm94SW5mby0+bG9naWNhbFdpZHRoKCkpOwotICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKGN1cnIgPT0gZW5jbG9zaW5nQm94KQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXRpY1Bvc2l0aW9uICs9IGVuY2xvc2luZ0JveC0+bG9naWNhbFdp ZHRoKCkgLSBib3hJbmZvLT5sb2dpY2FsV2lkdGgoKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGlmIChjdXJyID09ICZlbmNsb3NpbmdCb3gpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3RhdGljUG9zaXRpb24gKz0gZW5jbG9zaW5nQm94LmxvZ2ljYWxXaWR0aCgpIC0gYm94SW5mby0+ bG9naWNhbFdpZHRoKCk7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxvd1RocmVhZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1Ro cmVhZC5jcHAKaW5kZXggOTEwNGEwM2RiMzA1OTk5NTVkM2FlMDU2ZDM2MjAyYTQ2MDBhYWEyMy4u NGRiYmRjNWE3MzMwNWVmYzZmYjc3ZjExNDY2ZjA2Y2I0NTFiYzk0NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcApAQCAtODIzLDcgKzgyMyw3IEBA IGJvb2wgUmVuZGVyRmxvd1RocmVhZDo6Y29tcHV0ZWRSZWdpb25SYW5nZUZvckJveChjb25zdCBS ZW5kZXJCb3gqIGJveCwgUmVuZGVyUmVnCiAgICAgICAgIC8vIChlLmcuIGlmIHdlIHVzZSBjb250 YWluaW5nQmxvY2soKSB0aGUgc2hhZG93IGNvbnRyb2xzIG9mIGEgdmlkZW8gZWxlbWVudCB3b24n dCBnZXQgdGhlIHJhbmdlIGZyb20gdGhlCiAgICAgICAgIC8vIHZpZGVvIGJveCBiZWNhdXNlIGl0 J3Mgbm90IGEgYmxvY2s7IHRoZXkgbmVlZCB0byBiZSBwYXRjaGVkIHNlcGFyYXRlbHkpLgogICAg ICAgICBBU1NFUlQoY2ItPnBhcmVudCgpKTsKLSAgICAgICAgY2IgPSBjYi0+cGFyZW50KCktPmVu Y2xvc2luZ0JveCgpOworICAgICAgICBjYiA9ICZjYi0+cGFyZW50KCktPmVuY2xvc2luZ0JveCgp OwogICAgICAgICBBU1NFUlQoY2IpOwogCiAgICAgICAgIC8vIElmIGEgYm94IGRvZXNuJ3QgaGF2 ZSBhIGNhY2hlZCByZWdpb24gcmFuZ2UgaXQgdXN1YWxseSBtZWFucyB0aGUgYm94IGJlbG9uZ3Mg dG8gYSBsaW5lIHNvIHN0YXJ0UmVnaW9uIHNob3VsZCBiZSBlcXVhbCB3aXRoIGVuZFJlZ2lvbi4K QEAgLTg2NSwxMiArODY1LDExIEBAIGJvb2wgUmVuZGVyRmxvd1RocmVhZDo6b2JqZWN0U2hvdWxk RnJhZ21lbnRJbkZsb3dSZWdpb24oY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplCiAgICAgaWYgKCFt X3JlZ2lvbkxpc3QuY29udGFpbnMoY29uc3RfY2FzdDxSZW5kZXJSZWdpb24qPihyZWdpb24pKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAotICAgIFJlbmRlckJveCogZW5jbG9zaW5nQm94 ID0gb2JqZWN0LT5lbmNsb3NpbmdCb3goKTsKICAgICBSZW5kZXJSZWdpb24qIGVuY2xvc2luZ0Jv eFN0YXJ0UmVnaW9uID0gbnVsbHB0cjsKICAgICBSZW5kZXJSZWdpb24qIGVuY2xvc2luZ0JveEVu ZFJlZ2lvbiA9IG51bGxwdHI7CiAgICAgLy8gSWYgdGhlIGJveCBoYXMgbm8gcmFuZ2UsIGRvIG5v dCBjaGVjayByZWdpb25JblJhbmdlLiBCb3hlcyBpbnNpZGUgaW5saW5lcyBkbyBub3QgZ2V0IHJh bmdlcy4KICAgICAvLyBJbnN0ZWFkLCB0aGUgY29udGFpbmluZyBSb290SW5saW5lQm94IHdpbGwg YWJvcnQgd2hlbiB0cnlpbmcgdG8gcGFpbnQgaW5zaWRlIHRoZSB3cm9uZyByZWdpb24uCi0gICAg aWYgKGNvbXB1dGVkUmVnaW9uUmFuZ2VGb3JCb3goZW5jbG9zaW5nQm94LCBlbmNsb3NpbmdCb3hT dGFydFJlZ2lvbiwgZW5jbG9zaW5nQm94RW5kUmVnaW9uKQorICAgIGlmIChjb21wdXRlZFJlZ2lv blJhbmdlRm9yQm94KCZvYmplY3QtPmVuY2xvc2luZ0JveCgpLCBlbmNsb3NpbmdCb3hTdGFydFJl Z2lvbiwgZW5jbG9zaW5nQm94RW5kUmVnaW9uKQogICAgICAgICAmJiAhcmVnaW9uSW5SYW5nZShy ZWdpb24sIGVuY2xvc2luZ0JveFN0YXJ0UmVnaW9uLCBlbmNsb3NpbmdCb3hFbmRSZWdpb24pKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCkBAIC04ODksMTAgKzg4OCw5IEBAIGJvb2wgUmVu ZGVyRmxvd1RocmVhZDo6b2JqZWN0SW5GbG93UmVnaW9uKGNvbnN0IFJlbmRlck9iamVjdCogb2Jq ZWN0LCBjb25zdCBSZW5kCiAgICAgaWYgKCFtX3JlZ2lvbkxpc3QuY29udGFpbnMoY29uc3RfY2Fz dDxSZW5kZXJSZWdpb24qPihyZWdpb24pKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg UmVuZGVyQm94KiBlbmNsb3NpbmdCb3ggPSBvYmplY3QtPmVuY2xvc2luZ0JveCgpOwogICAgIFJl bmRlclJlZ2lvbiogZW5jbG9zaW5nQm94U3RhcnRSZWdpb24gPSBudWxscHRyOwogICAgIFJlbmRl clJlZ2lvbiogZW5jbG9zaW5nQm94RW5kUmVnaW9uID0gbnVsbHB0cjsKLSAgICBpZiAoIWdldFJl Z2lvblJhbmdlRm9yQm94KGVuY2xvc2luZ0JveCwgZW5jbG9zaW5nQm94U3RhcnRSZWdpb24sIGVu Y2xvc2luZ0JveEVuZFJlZ2lvbikpCisgICAgaWYgKCFnZXRSZWdpb25SYW5nZUZvckJveCgmb2Jq ZWN0LT5lbmNsb3NpbmdCb3goKSwgZW5jbG9zaW5nQm94U3RhcnRSZWdpb24sIGVuY2xvc2luZ0Jv eEVuZFJlZ2lvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghcmVnaW9uSW5S YW5nZShyZWdpb24sIGVuY2xvc2luZ0JveFN0YXJ0UmVnaW9uLCBlbmNsb3NpbmdCb3hFbmRSZWdp b24pKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggYzVlZjA2 NDQ1ZjIwMmU4OWI2ZDNjZDk2MDVhZTI2ODc4ZDdjZGM5My4uMDBkNjIyNGFmMGVlYjExNjU3OGIy ODFjMDdkYWY2NDViMGIwZjdjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwCkBAIC01MzM0LDcgKzUzMzQsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVS ZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBjb25zdAogICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGxheWVyQm91bmRzV2l0aFZpc3VhbE92ZXJm bG93Lm1vdmVCeShMYXlvdXRQb2ludChmbG93VGhyZWFkLT53aWR0aCgpLCAwKSk7CiAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBSZW5kZXJCbG9jayogcmVuZGVyZXJDb250YWluaW5nQmxv Y2sgPSBib3hNb2RlbE9iamVjdC5lbmNsb3NpbmdCb3goKS0+aXNSZW5kZXJCbG9jaygpID8gdG9S ZW5kZXJCbG9jayhib3hNb2RlbE9iamVjdC5lbmNsb3NpbmdCb3goKSkgOiAwOworICAgICAgICAg ICAgUmVuZGVyQmxvY2sqIHJlbmRlcmVyQ29udGFpbmluZ0Jsb2NrID0gYm94TW9kZWxPYmplY3Qu ZW5jbG9zaW5nQm94KCkuaXNSZW5kZXJCbG9jaygpID8gdG9SZW5kZXJCbG9jaygmYm94TW9kZWxP YmplY3QuZW5jbG9zaW5nQm94KCkpIDogMDsKICAgICAgICAgICAgIGlmIChyZW5kZXJlckNvbnRh aW5pbmdCbG9jaykKICAgICAgICAgICAgICAgICByZW5kZXJlckNvbnRhaW5pbmdCbG9jay0+Zmxp cEZvcldyaXRpbmdNb2RlKGxheWVyQm91bmRzV2l0aFZpc3VhbE92ZXJmbG93KTsKICAgICAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAwZmRlNTkz ODU5ZWMxYmIyY2QzMjBhMmNkNGM5NGZjMGY3MWZmNDVjLi4zYjNmMDEwZWYxNjc1YTU0N2IxYTlm MGUzYmMxNDlkNGYyYzhhNjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcApAQCAtNDkwLDEwICs0OTAsOSBAQCBib29sIFJlbmRlck9iamVjdDo6c2Nyb2xsUmVj dFRvVmlzaWJsZShjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBjb25zdCBTY3JvbGxBbGlnbgogICAg IHJldHVybiB0cnVlOwogfQogCi1SZW5kZXJCb3gqIFJlbmRlck9iamVjdDo6ZW5jbG9zaW5nQm94 KCkgY29uc3QKK1JlbmRlckJveCYgUmVuZGVyT2JqZWN0OjplbmNsb3NpbmdCb3goKSBjb25zdAog ewotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCByZXR1cm4gYSByZWZlcmVuY2U7IGl0IGNhbiBh bHdheXMgZmluZCB0aGUgcm9vdCBSZW5kZXJWaWV3LgotICAgIHJldHVybiBsaW5lYWdlT2ZUeXBl PFJlbmRlckJveD4oY29uc3RfY2FzdDxSZW5kZXJPYmplY3QmPigqdGhpcykpLmZpcnN0KCk7Cisg ICAgcmV0dXJuICpsaW5lYWdlT2ZUeXBlPFJlbmRlckJveD4oY29uc3RfY2FzdDxSZW5kZXJPYmpl Y3QmPigqdGhpcykpLmZpcnN0KCk7CiB9CiAKIFJlbmRlckJveE1vZGVsT2JqZWN0KiBSZW5kZXJP YmplY3Q6OmVuY2xvc2luZ0JveE1vZGVsT2JqZWN0KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuaAppbmRleCA2NDkyYTAwZDc5NTEyMjA5ODRiYjIxZTE5MzI2Njdm YjJiODlmZmY4Li4wZWE0NDdmNzczZmUwNDcyMDM0MWRmNmNjYTg5MGJlY2QxZDU2ZDMyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC0yMDYsNyArMjA2LDcgQEAg cHVibGljOgogICAgIGJvb2wgc2Nyb2xsUmVjdFRvVmlzaWJsZShjb25zdCBMYXlvdXRSZWN0Jiwg Y29uc3QgU2Nyb2xsQWxpZ25tZW50JiBhbGlnblggPSBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduQ2Vu dGVySWZOZWVkZWQsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25ZID0gU2Nyb2xsQWxpZ25t ZW50OjphbGlnbkNlbnRlcklmTmVlZGVkKTsKIAogICAgIC8vIENvbnZlbmllbmNlIGZ1bmN0aW9u IGZvciBnZXR0aW5nIHRvIHRoZSBuZWFyZXN0IGVuY2xvc2luZyBib3ggb2YgYSBSZW5kZXJPYmpl Y3QuCi0gICAgUmVuZGVyQm94KiBlbmNsb3NpbmdCb3goKSBjb25zdDsKKyAgICBSZW5kZXJCb3gm IGVuY2xvc2luZ0JveCgpIGNvbnN0OwogICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBlbmNsb3Np bmdCb3hNb2RlbE9iamVjdCgpIGNvbnN0OwogCiAgICAgYm9vbCBmaXhlZFBvc2l0aW9uZWRXaXRo TmFtZWRGbG93Q29udGFpbmluZ0Jsb2NrKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCmluZGV4IGQ3ZWNiOWY1NDk2NzA4YWMwZjIwMzU2ZjA4 M2FiY2I5NTU3ZmY5YTguLjA0YTZhOGE3MWMxMDczZTY0ZjA5MzI5NzA1ZjA4MmQ3YjhhY2JlMzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCkBAIC03 Nyw3ICs3Nyw5IEBAIFJlbmRlckJveCogUmVuZGVyU2Nyb2xsYmFyOjpvd25pbmdSZW5kZXJlcigp IGNvbnN0CiAgICAgICAgIHJldHVybiBjdXJyZW50UmVuZGVyZXI7CiAgICAgfQogICAgIEFTU0VS VChtX293bmVyRWxlbWVudCk7Ci0gICAgcmV0dXJuIG1fb3duZXJFbGVtZW50LT5yZW5kZXJlcigp ID8gbV9vd25lckVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0JveCgpIDogbnVsbHB0cjsK KyAgICBpZiAobV9vd25lckVsZW1lbnQtPnJlbmRlcmVyKCkpCisgICAgICAgIHJldHVybiAmbV9v d25lckVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0JveCgpOworICAgIHJldHVybiBudWxs cHRyOwogfQogCiB2b2lkIFJlbmRlclNjcm9sbGJhcjo6c2V0UGFyZW50KFNjcm9sbFZpZXcqIHBh cmVudCkK 233156 2014-06-16 06:10:50 -0700 2014-06-16 12:52:50 -0700 verification on win-ews bug-133902-20140616221025.patch text/plain 15453 je_julie.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5OTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQwYjdlNzJkZjA5MmM3 ZjBjNDBmODc1YzA1ODQ2ODRkNGE5OTVhZS4uOThkN2QzNGJiMjZmNDdkOTE2MjliMWEzYjhkZWEx MWJmMWY3MjMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE0LTA2LTE0ICBKZW9u Z2V1biBLaW0gIDxqZV9qdWxpZS5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgVXNlIHJlZmVy ZW5jZXMgaW5zdGVhZCBvZiBwb2ludGVycyB0byBSZW5kZXJCbG9jayBpbiBSZW5kZXJPYmplY3Q6 OmVuY2xvc2luZ0JveCgpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMzOTAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgSnVzdCBhIHN0cmFpZ2h0Zm9yd2FyZCBjb252ZXJzaW9uIGZyb20gcG9pbnRlcnMg dG8gcmVmZXJlbmNlcy4KKworICAgICAgICBObyBuZXcgdGVzdHMsIG5vIGJlaGF2aW9yIGNoYW5n ZS4KKworICAgICAgICAqIGJpbmRpbmdzL29iamMvRE9NVUlLaXRFeHRlbnNpb25zLm1tOgorICAg ICAgICAoLVtET01IVE1MRWxlbWVudCBzdHJ1Y3R1cmFsQ29tcGxleGl0eUNvbnRyaWJ1dGlvbl0p OgorICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZSk6CisgICAgICAgICogaW5zcGVjdG9y L0luc3BlY3Rvck92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JS ZW5kZXJlckZyYWdtZW50cyk6CisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6c2Nyb2xsTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRs ZXI6OnNjcm9sbE92ZXJmbG93KToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6bG9n aWNhbFNjcm9sbE92ZXJmbG93KToKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OmxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlSW5saW5lU3RhdGljRGlzdGFu Y2UpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmNvbXB1dGVkUmVnaW9uUmFuZ2VGb3JCb3gpOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6b2JqZWN0U2hvdWxkRnJhZ21lbnRJ bkZsb3dSZWdpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6b2JqZWN0 SW5GbG93UmVnaW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJP YmplY3Q6OmVuY2xvc2luZ0JveCk6IFJlbW92ZWQgRklYTUUgY29tbWVudAorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyU2Nyb2xs YmFyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclNjcm9sbGJhcjo6b3duaW5nUmVuZGVy ZXIpOgorCiAyMDE0LTA2LTEyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlh LmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgYWxsIGRlcHJlY2F0ZWQgQVBJIGZyb20gR09i amVjdCBET00gYmluZGluZ3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL29i amMvRE9NVUlLaXRFeHRlbnNpb25zLm1tIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9E T01VSUtpdEV4dGVuc2lvbnMubW0KaW5kZXggMjlmZmY4NjkzOGNkZmRjZDk5MmFkMzRkZWM5MThk YTE4NTk3MjQ1Mi4uY2MwMmJjM2I5MTc5YjUxYmRmN2YyY2Q3OGY4M2IxYWIzNjU3NGRiOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01VSUtpdEV4dGVuc2lvbnMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01VSUtpdEV4dGVuc2lvbnMu bW0KQEAgLTM0OSwxMCArMzQ5LDEwIEBAIC0gKGludClzdHJ1Y3R1cmFsQ29tcGxleGl0eUNvbnRy aWJ1dGlvbgogICAgICAgICB9IGVsc2UgaWYgKHJlbmRlcmVyLT5pc1JlbmRlckJsb2NrRmxvdygp IHx8IChyZW5kZXJlci0+aXNSZW5kZXJCbG9jaygpICYmIHRvUmVuZGVyQmxvY2socmVuZGVyZXIp LT5pbmxpbmVFbGVtZW50Q29udGludWF0aW9uKCkgIT0gMCkpIHsKICAgICAgICAgICAgIEJPT0wg bm9Db3N0ID0gTk87CiAgICAgICAgICAgICBpZiAocmVuZGVyZXItPmlzQm94KCkpIHsKLSAgICAg ICAgICAgICAgICBSZW5kZXJCb3ggKmFzQm94ID0gcmVuZGVyZXItPmVuY2xvc2luZ0JveCgpOwot ICAgICAgICAgICAgICAgIFJlbmRlck9iamVjdCAqcGFyZW50ID0gYXNCb3gtPnBhcmVudCgpOwor ICAgICAgICAgICAgICAgIFJlbmRlckJveCAmYXNCb3ggPSByZW5kZXJlci0+ZW5jbG9zaW5nQm94 KCk7CisgICAgICAgICAgICAgICAgUmVuZGVyT2JqZWN0ICpwYXJlbnQgPSBhc0JveC5wYXJlbnQo KTsKICAgICAgICAgICAgICAgICBSZW5kZXJCb3ggKnBhcmVudFJlbmRlckJveCA9IChwYXJlbnQg JiYgcGFyZW50LT5pc0JveCgpKSA/IHRvUmVuZGVyQm94KHBhcmVudCkgOiAwOwotICAgICAgICAg ICAgICAgIGlmIChwYXJlbnRSZW5kZXJCb3ggJiYgYXNCb3ggJiYgYXNCb3gtPndpZHRoKCkgPT0g cGFyZW50UmVuZGVyQm94LT53aWR0aCgpKSB7CisgICAgICAgICAgICAgICAgaWYgKHBhcmVudFJl bmRlckJveCAmJiBhc0JveC53aWR0aCgpID09IHBhcmVudFJlbmRlckJveC0+d2lkdGgoKSkgewog ICAgICAgICAgICAgICAgICAgICBub0Nvc3QgPSBZRVM7CiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5kZXgg ZDdmMWJhNjRmMjUwMTdjNmM0YmE3ZTkyNjNiZTFhMDM5MDJkM2VhMC4uNDczYTIyNWYzNzc5OTVh OTAyNTI2NWM3NDcyNzdkODllOTQ4MGNlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCkBAIC01NjExLDcgKzU2MTEsNyBAQCBib29sIEhUTUxNZWRpYUVsZW1lbnQ6 Om1lZGlhUGxheWVySXNWaWRlbygpIGNvbnN0CiBMYXlvdXRSZWN0IEhUTUxNZWRpYUVsZW1lbnQ6 Om1lZGlhUGxheWVyQ29udGVudEJveFJlY3QoKSBjb25zdAogewogICAgIGlmIChyZW5kZXJlcigp KQotICAgICAgICByZXR1cm4gcmVuZGVyZXIoKS0+ZW5jbG9zaW5nQm94KCktPmNvbnRlbnRCb3hS ZWN0KCk7CisgICAgICAgIHJldHVybiByZW5kZXJlcigpLT5lbmNsb3NpbmdCb3goKS5jb250ZW50 Qm94UmVjdCgpOwogICAgIHJldHVybiBMYXlvdXRSZWN0KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcAppbmRleCAwMWQxNjcxZmY0YzEzZDNm MGZmYjNlMGM5MDFjMTQ0NzA2YWE5YzAxLi40MTQxYjcxMjZmZGJmZmZkN2NlMWY2MGZiNThmODRl MDlmMWZjNWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y T3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJs YXkuY3BwCkBAIC01MTEsMTAgKzUxMSw5IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvckFy cmF5PiBidWlsZE9iamVjdEZvclJlbmRlcmVyRnJhZ21lbnRzKFJlbmRlck9iamVjdCoKICAgICAg ICAgYnVpbGRSZW5kZXJlckhpZ2hsaWdodChyZW5kZXJlciwgbnVsbHB0ciwgY29uZmlnLCAmaGln aGxpZ2h0KTsKICAgICAgICAgZnJhZ21lbnRzQXJyYXktPnB1c2hPYmplY3QoYnVpbGRPYmplY3RG b3JIaWdobGlnaHQoaGlnaGxpZ2h0KSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgUmVuZGVyQm94 KiBlbmNsb3NpbmdCb3ggPSByZW5kZXJlci0+ZW5jbG9zaW5nQm94KCk7CiAgICAgICAgIFJlbmRl clJlZ2lvbiogc3RhcnRSZWdpb24gPSBudWxscHRyOwogICAgICAgICBSZW5kZXJSZWdpb24qIGVu ZFJlZ2lvbiA9IG51bGxwdHI7Ci0gICAgICAgIGlmICghY29udGFpbmluZ0Zsb3dUaHJlYWQtPmdl dFJlZ2lvblJhbmdlRm9yQm94KGVuY2xvc2luZ0JveCwgc3RhcnRSZWdpb24sIGVuZFJlZ2lvbikp IHsKKyAgICAgICAgaWYgKCFjb250YWluaW5nRmxvd1RocmVhZC0+Z2V0UmVnaW9uUmFuZ2VGb3JC b3goJnJlbmRlcmVyLT5lbmNsb3NpbmdCb3goKSwgc3RhcnRSZWdpb24sIGVuZFJlZ2lvbikpIHsK ICAgICAgICAgICAgIC8vIFRoZSBmbG93IGhhcyBubyB2aXNpYmxlIHJlZ2lvbnMuIFRoZSByZW5k ZXJlciBpcyBub3QgdmlzaWJsZSBvbiBzY3JlZW4uCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDg3MzEy Yjc5ZmQwMDBmNWRhZTMzNDdlYjU4N2FjZmIxOGQ1OTU1NDEuLjhlMDY4MDRiOTZlYjNlZGRjOTNl M2U2ZmM4ODA4ZGFlNGZjZTAxYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAK QEAgLTI4OSwxMCArMjg5LDEwIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBzY3JvbGxOb2RlKGZsb2F0 IGRlbHRhLCBTY3JvbGxHcmFudWxhcml0eSBncmFudWxhcml0eSwgU2Nyb2xsCiAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICBpZiAoIW5vZGUtPnJlbmRlcmVyKCkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICBSZW5kZXJCb3gqIGVuY2xvc2luZ0JveCA9IG5vZGUtPnJlbmRlcmVyKCktPmVu Y2xvc2luZ0JveCgpOworICAgIFJlbmRlckJveCYgZW5jbG9zaW5nQm94ID0gbm9kZS0+cmVuZGVy ZXIoKS0+ZW5jbG9zaW5nQm94KCk7CiAgICAgZmxvYXQgYWJzRGVsdGEgPSBkZWx0YSA+IDAgPyBk ZWx0YSA6IC1kZWx0YTsKIAotICAgIHJldHVybiBlbmNsb3NpbmdCb3gtPnNjcm9sbChkZWx0YSA8 IDAgPyBuZWdhdGl2ZURpcmVjdGlvbiA6IHBvc2l0aXZlRGlyZWN0aW9uLCBncmFudWxhcml0eSwg YWJzRGVsdGEsIHN0b3BFbGVtZW50LCBlbmNsb3NpbmdCb3gsIHdoZWVsRXZlbnRBYnNvbHV0ZVBv aW50KTsKKyAgICByZXR1cm4gZW5jbG9zaW5nQm94LnNjcm9sbChkZWx0YSA8IDAgPyBuZWdhdGl2 ZURpcmVjdGlvbiA6IHBvc2l0aXZlRGlyZWN0aW9uLCBncmFudWxhcml0eSwgYWJzRGVsdGEsIHN0 b3BFbGVtZW50LCAmZW5jbG9zaW5nQm94LCB3aGVlbEV2ZW50QWJzb2x1dGVQb2ludCk7CiB9CiAK ICNpZiAoRU5BQkxFKFRPVUNIX0VWRU5UUykgJiYgIVBMQVRGT1JNKElPUykpCkBAIC0xMTA2LDcg KzExMDYsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6c2Nyb2xsT3ZlcmZsb3coU2Nyb2xsRGlyZWN0 aW9uIGRpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHkgZwogICAgIAogICAgIGlmIChub2RlKSB7 CiAgICAgICAgIGF1dG8gciA9IG5vZGUtPnJlbmRlcmVyKCk7Ci0gICAgICAgIGlmIChyICYmICFy LT5pc0xpc3RCb3goKSAmJiByLT5lbmNsb3NpbmdCb3goKS0+c2Nyb2xsKGRpcmVjdGlvbiwgZ3Jh bnVsYXJpdHkpKSB7CisgICAgICAgIGlmIChyICYmICFyLT5pc0xpc3RCb3goKSAmJiByLT5lbmNs b3NpbmdCb3goKS5zY3JvbGwoZGlyZWN0aW9uLCBncmFudWxhcml0eSkpIHsKICAgICAgICAgICAg IHNldEZyYW1lV2FzU2Nyb2xsZWRCeVVzZXIoKTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwog ICAgICAgICB9CkBAIC0xMTI3LDcgKzExMjcsNyBAQCBib29sIEV2ZW50SGFuZGxlcjo6bG9naWNh bFNjcm9sbE92ZXJmbG93KFNjcm9sbExvZ2ljYWxEaXJlY3Rpb24gZGlyZWN0aW9uLCBTY3JvbAog ICAgIAogICAgIGlmIChub2RlKSB7CiAgICAgICAgIGF1dG8gciA9IG5vZGUtPnJlbmRlcmVyKCk7 Ci0gICAgICAgIGlmIChyICYmICFyLT5pc0xpc3RCb3goKSAmJiByLT5lbmNsb3NpbmdCb3goKS0+ bG9naWNhbFNjcm9sbChkaXJlY3Rpb24sIGdyYW51bGFyaXR5KSkgeworICAgICAgICBpZiAociAm JiAhci0+aXNMaXN0Qm94KCkgJiYgci0+ZW5jbG9zaW5nQm94KCkubG9naWNhbFNjcm9sbChkaXJl Y3Rpb24sIGdyYW51bGFyaXR5KSkgewogICAgICAgICAgICAgc2V0RnJhbWVXYXNTY3JvbGxlZEJ5 VXNlcigpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcAppbmRleCA3ZDdmZTc0NmMzNjhhOGEzZmE0NWQ2OWY0NzFkMjAxNmU0NDJm NWY4Li5kYWViNGQ2ZmIwOWJmYTc3NGMwM2ViYTcwNDU2MDI3MmQwNWY0MWVlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCkBAIC0xMTg5LDcgKzExODksNyBAQCB2b2lkIEZyYW1lVmlldzo6 bGF5b3V0KGJvb2wgYWxsb3dTdWJ0cmVlKQogICAgICAgICAgICAgICAgIGlmIChib2R5LT5oYXNU YWdOYW1lKGZyYW1lc2V0VGFnKSAmJiAhZnJhbWVGbGF0dGVuaW5nRW5hYmxlZCgpKSB7CiAgICAg ICAgICAgICAgICAgICAgIGJvZHktPnJlbmRlcmVyKCktPnNldENoaWxkTmVlZHNMYXlvdXQoKTsK ICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKGJvZHktPmhhc1RhZ05hbWUoYm9keVRhZykpIHsK LSAgICAgICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0ICYmIG1fc2l6ZS5oZWlnaHQo KSAhPSBsYXlvdXRIZWlnaHQoKSAmJiBib2R5LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdCb3goKS0+ c3RyZXRjaGVzVG9WaWV3cG9ydCgpKQorICAgICAgICAgICAgICAgICAgICBpZiAoIW1fZmlyc3RM YXlvdXQgJiYgbV9zaXplLmhlaWdodCgpICE9IGxheW91dEhlaWdodCgpICYmIGJvZHktPnJlbmRl cmVyKCktPmVuY2xvc2luZ0JveCgpLnN0cmV0Y2hlc1RvVmlld3BvcnQoKSkKICAgICAgICAgICAg ICAgICAgICAgICAgIGJvZHktPnJlbmRlcmVyKCktPnNldENoaWxkTmVlZHNMYXlvdXQoKTsKICAg ICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCb3guY3BwCmluZGV4IDNmNmQxYWM0ZWRiMmFmYTMyMzI1ZTQ3NGQ3MTQ3OTMzMTRhYmFhZmQu LmRkNzY4NWM1MzUxMjVkZjRiMmRlODNiOWFmMmE2ZDVlNzNmYmYyYmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0zMTYzLDE0ICszMTYzLDE0IEBAIHN0YXRpYyB2 b2lkIGNvbXB1dGVJbmxpbmVTdGF0aWNEaXN0YW5jZShMZW5ndGgmIGxvZ2ljYWxMZWZ0LCBMZW5n dGgmIGxvZ2ljYWxSaWdoCiAgICAgICAgIH0KICAgICAgICAgbG9naWNhbExlZnQuc2V0VmFsdWUo Rml4ZWQsIHN0YXRpY1Bvc2l0aW9uKTsKICAgICB9IGVsc2UgewotICAgICAgICBSZW5kZXJCb3gq IGVuY2xvc2luZ0JveCA9IGNoaWxkLT5wYXJlbnQoKS0+ZW5jbG9zaW5nQm94KCk7CisgICAgICAg IFJlbmRlckJveCYgZW5jbG9zaW5nQm94ID0gY2hpbGQtPnBhcmVudCgpLT5lbmNsb3NpbmdCb3go KTsKICAgICAgICAgTGF5b3V0VW5pdCBzdGF0aWNQb3NpdGlvbiA9IGNoaWxkLT5sYXllcigpLT5z dGF0aWNJbmxpbmVQb3NpdGlvbigpICsgY29udGFpbmVyTG9naWNhbFdpZHRoICsgY29udGFpbmVy QmxvY2stPmJvcmRlckxvZ2ljYWxMZWZ0KCk7Ci0gICAgICAgIGZvciAoUmVuZGVyRWxlbWVudCog Y3VyciA9IGVuY2xvc2luZ0JveDsgY3VycjsgY3VyciA9IGN1cnItPmNvbnRhaW5lcigpKSB7Cisg ICAgICAgIGZvciAoUmVuZGVyRWxlbWVudCogY3VyciA9ICZlbmNsb3NpbmdCb3g7IGN1cnI7IGN1 cnIgPSBjdXJyLT5jb250YWluZXIoKSkgewogICAgICAgICAgICAgaWYgKGN1cnItPmlzQm94KCkp IHsKICAgICAgICAgICAgICAgICBpZiAoY3VyciAhPSBjb250YWluZXJCbG9jaykKICAgICAgICAg ICAgICAgICAgICAgc3RhdGljUG9zaXRpb24gLT0gdG9SZW5kZXJCb3goY3VyciktPmxvZ2ljYWxM ZWZ0KCk7Ci0gICAgICAgICAgICAgICAgaWYgKGN1cnIgPT0gZW5jbG9zaW5nQm94KQotICAgICAg ICAgICAgICAgICAgICBzdGF0aWNQb3NpdGlvbiAtPSBlbmNsb3NpbmdCb3gtPmxvZ2ljYWxXaWR0 aCgpOworICAgICAgICAgICAgICAgIGlmIChjdXJyID09ICZlbmNsb3NpbmdCb3gpCisgICAgICAg ICAgICAgICAgICAgIHN0YXRpY1Bvc2l0aW9uIC09IGVuY2xvc2luZ0JveC5sb2dpY2FsV2lkdGgo KTsKICAgICAgICAgICAgICAgICBpZiAocmVnaW9uICYmIGN1cnItPmlzUmVuZGVyQmxvY2soKSkg ewogICAgICAgICAgICAgICAgICAgICBjb25zdCBSZW5kZXJCbG9jayogY2IgPSB0b1JlbmRlckJs b2NrKGN1cnIpOwogICAgICAgICAgICAgICAgICAgICByZWdpb24gPSBjYi0+Y2xhbXBUb1N0YXJ0 QW5kRW5kUmVnaW9ucyhyZWdpb24pOwpAQCAtMzE3OCw4ICszMTc4LDggQEAgc3RhdGljIHZvaWQg Y29tcHV0ZUlubGluZVN0YXRpY0Rpc3RhbmNlKExlbmd0aCYgbG9naWNhbExlZnQsIExlbmd0aCYg bG9naWNhbFJpZ2gKICAgICAgICAgICAgICAgICAgICAgaWYgKGJveEluZm8pIHsKICAgICAgICAg ICAgICAgICAgICAgICAgIGlmIChjdXJyICE9IGNvbnRhaW5lckJsb2NrKQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXRpY1Bvc2l0aW9uIC09IGNiLT5sb2dpY2FsV2lkdGgoKSAtIChi b3hJbmZvLT5sb2dpY2FsTGVmdCgpICsgYm94SW5mby0+bG9naWNhbFdpZHRoKCkpOwotICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKGN1cnIgPT0gZW5jbG9zaW5nQm94KQotICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHN0YXRpY1Bvc2l0aW9uICs9IGVuY2xvc2luZ0JveC0+bG9naWNhbFdp ZHRoKCkgLSBib3hJbmZvLT5sb2dpY2FsV2lkdGgoKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGlmIChjdXJyID09ICZlbmNsb3NpbmdCb3gpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg c3RhdGljUG9zaXRpb24gKz0gZW5jbG9zaW5nQm94LmxvZ2ljYWxXaWR0aCgpIC0gYm94SW5mby0+ bG9naWNhbFdpZHRoKCk7CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRmxvd1RocmVhZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1Ro cmVhZC5jcHAKaW5kZXggOTEwNGEwM2RiMzA1OTk5NTVkM2FlMDU2ZDM2MjAyYTQ2MDBhYWEyMy4u NGRiYmRjNWE3MzMwNWVmYzZmYjc3ZjExNDY2ZjA2Y2I0NTFiYzk0NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcApAQCAtODIzLDcgKzgyMyw3IEBA IGJvb2wgUmVuZGVyRmxvd1RocmVhZDo6Y29tcHV0ZWRSZWdpb25SYW5nZUZvckJveChjb25zdCBS ZW5kZXJCb3gqIGJveCwgUmVuZGVyUmVnCiAgICAgICAgIC8vIChlLmcuIGlmIHdlIHVzZSBjb250 YWluaW5nQmxvY2soKSB0aGUgc2hhZG93IGNvbnRyb2xzIG9mIGEgdmlkZW8gZWxlbWVudCB3b24n dCBnZXQgdGhlIHJhbmdlIGZyb20gdGhlCiAgICAgICAgIC8vIHZpZGVvIGJveCBiZWNhdXNlIGl0 J3Mgbm90IGEgYmxvY2s7IHRoZXkgbmVlZCB0byBiZSBwYXRjaGVkIHNlcGFyYXRlbHkpLgogICAg ICAgICBBU1NFUlQoY2ItPnBhcmVudCgpKTsKLSAgICAgICAgY2IgPSBjYi0+cGFyZW50KCktPmVu Y2xvc2luZ0JveCgpOworICAgICAgICBjYiA9ICZjYi0+cGFyZW50KCktPmVuY2xvc2luZ0JveCgp OwogICAgICAgICBBU1NFUlQoY2IpOwogCiAgICAgICAgIC8vIElmIGEgYm94IGRvZXNuJ3QgaGF2 ZSBhIGNhY2hlZCByZWdpb24gcmFuZ2UgaXQgdXN1YWxseSBtZWFucyB0aGUgYm94IGJlbG9uZ3Mg dG8gYSBsaW5lIHNvIHN0YXJ0UmVnaW9uIHNob3VsZCBiZSBlcXVhbCB3aXRoIGVuZFJlZ2lvbi4K QEAgLTg2NSwxMiArODY1LDExIEBAIGJvb2wgUmVuZGVyRmxvd1RocmVhZDo6b2JqZWN0U2hvdWxk RnJhZ21lbnRJbkZsb3dSZWdpb24oY29uc3QgUmVuZGVyT2JqZWN0KiBvYmplCiAgICAgaWYgKCFt X3JlZ2lvbkxpc3QuY29udGFpbnMoY29uc3RfY2FzdDxSZW5kZXJSZWdpb24qPihyZWdpb24pKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIAotICAgIFJlbmRlckJveCogZW5jbG9zaW5nQm94 ID0gb2JqZWN0LT5lbmNsb3NpbmdCb3goKTsKICAgICBSZW5kZXJSZWdpb24qIGVuY2xvc2luZ0Jv eFN0YXJ0UmVnaW9uID0gbnVsbHB0cjsKICAgICBSZW5kZXJSZWdpb24qIGVuY2xvc2luZ0JveEVu ZFJlZ2lvbiA9IG51bGxwdHI7CiAgICAgLy8gSWYgdGhlIGJveCBoYXMgbm8gcmFuZ2UsIGRvIG5v dCBjaGVjayByZWdpb25JblJhbmdlLiBCb3hlcyBpbnNpZGUgaW5saW5lcyBkbyBub3QgZ2V0IHJh bmdlcy4KICAgICAvLyBJbnN0ZWFkLCB0aGUgY29udGFpbmluZyBSb290SW5saW5lQm94IHdpbGwg YWJvcnQgd2hlbiB0cnlpbmcgdG8gcGFpbnQgaW5zaWRlIHRoZSB3cm9uZyByZWdpb24uCi0gICAg aWYgKGNvbXB1dGVkUmVnaW9uUmFuZ2VGb3JCb3goZW5jbG9zaW5nQm94LCBlbmNsb3NpbmdCb3hT dGFydFJlZ2lvbiwgZW5jbG9zaW5nQm94RW5kUmVnaW9uKQorICAgIGlmIChjb21wdXRlZFJlZ2lv blJhbmdlRm9yQm94KCZvYmplY3QtPmVuY2xvc2luZ0JveCgpLCBlbmNsb3NpbmdCb3hTdGFydFJl Z2lvbiwgZW5jbG9zaW5nQm94RW5kUmVnaW9uKQogICAgICAgICAmJiAhcmVnaW9uSW5SYW5nZShy ZWdpb24sIGVuY2xvc2luZ0JveFN0YXJ0UmVnaW9uLCBlbmNsb3NpbmdCb3hFbmRSZWdpb24pKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCkBAIC04ODksMTAgKzg4OCw5IEBAIGJvb2wgUmVu ZGVyRmxvd1RocmVhZDo6b2JqZWN0SW5GbG93UmVnaW9uKGNvbnN0IFJlbmRlck9iamVjdCogb2Jq ZWN0LCBjb25zdCBSZW5kCiAgICAgaWYgKCFtX3JlZ2lvbkxpc3QuY29udGFpbnMoY29uc3RfY2Fz dDxSZW5kZXJSZWdpb24qPihyZWdpb24pKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg UmVuZGVyQm94KiBlbmNsb3NpbmdCb3ggPSBvYmplY3QtPmVuY2xvc2luZ0JveCgpOwogICAgIFJl bmRlclJlZ2lvbiogZW5jbG9zaW5nQm94U3RhcnRSZWdpb24gPSBudWxscHRyOwogICAgIFJlbmRl clJlZ2lvbiogZW5jbG9zaW5nQm94RW5kUmVnaW9uID0gbnVsbHB0cjsKLSAgICBpZiAoIWdldFJl Z2lvblJhbmdlRm9yQm94KGVuY2xvc2luZ0JveCwgZW5jbG9zaW5nQm94U3RhcnRSZWdpb24sIGVu Y2xvc2luZ0JveEVuZFJlZ2lvbikpCisgICAgaWYgKCFnZXRSZWdpb25SYW5nZUZvckJveCgmb2Jq ZWN0LT5lbmNsb3NpbmdCb3goKSwgZW5jbG9zaW5nQm94U3RhcnRSZWdpb24sIGVuY2xvc2luZ0Jv eEVuZFJlZ2lvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmICghcmVnaW9uSW5S YW5nZShyZWdpb24sIGVuY2xvc2luZ0JveFN0YXJ0UmVnaW9uLCBlbmNsb3NpbmdCb3hFbmRSZWdp b24pKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggYzVlZjA2 NDQ1ZjIwMmU4OWI2ZDNjZDk2MDVhZTI2ODc4ZDdjZGM5My4uMDBkNjIyNGFmMGVlYjExNjU3OGIy ODFjMDdkYWY2NDViMGIwZjdjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuY3BwCkBAIC01MzM0LDcgKzUzMzQsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVS ZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBjb25zdAogICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGxheWVyQm91bmRzV2l0aFZpc3VhbE92ZXJm bG93Lm1vdmVCeShMYXlvdXRQb2ludChmbG93VGhyZWFkLT53aWR0aCgpLCAwKSk7CiAgICAgICAg IH0gZWxzZSB7Ci0gICAgICAgICAgICBSZW5kZXJCbG9jayogcmVuZGVyZXJDb250YWluaW5nQmxv Y2sgPSBib3hNb2RlbE9iamVjdC5lbmNsb3NpbmdCb3goKS0+aXNSZW5kZXJCbG9jaygpID8gdG9S ZW5kZXJCbG9jayhib3hNb2RlbE9iamVjdC5lbmNsb3NpbmdCb3goKSkgOiAwOworICAgICAgICAg ICAgUmVuZGVyQmxvY2sqIHJlbmRlcmVyQ29udGFpbmluZ0Jsb2NrID0gYm94TW9kZWxPYmplY3Qu ZW5jbG9zaW5nQm94KCkuaXNSZW5kZXJCbG9jaygpID8gdG9SZW5kZXJCbG9jaygmYm94TW9kZWxP YmplY3QuZW5jbG9zaW5nQm94KCkpIDogMDsKICAgICAgICAgICAgIGlmIChyZW5kZXJlckNvbnRh aW5pbmdCbG9jaykKICAgICAgICAgICAgICAgICByZW5kZXJlckNvbnRhaW5pbmdCbG9jay0+Zmxp cEZvcldyaXRpbmdNb2RlKGxheWVyQm91bmRzV2l0aFZpc3VhbE92ZXJmbG93KTsKICAgICAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAwZmRlNTkz ODU5ZWMxYmIyY2QzMjBhMmNkNGM5NGZjMGY3MWZmNDVjLi4zYjNmMDEwZWYxNjc1YTU0N2IxYTlm MGUzYmMxNDlkNGYyYzhhNjBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcApAQCAtNDkwLDEwICs0OTAsOSBAQCBib29sIFJlbmRlck9iamVjdDo6c2Nyb2xsUmVj dFRvVmlzaWJsZShjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBjb25zdCBTY3JvbGxBbGlnbgogICAg IHJldHVybiB0cnVlOwogfQogCi1SZW5kZXJCb3gqIFJlbmRlck9iamVjdDo6ZW5jbG9zaW5nQm94 KCkgY29uc3QKK1JlbmRlckJveCYgUmVuZGVyT2JqZWN0OjplbmNsb3NpbmdCb3goKSBjb25zdAog ewotICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCByZXR1cm4gYSByZWZlcmVuY2U7IGl0IGNhbiBh bHdheXMgZmluZCB0aGUgcm9vdCBSZW5kZXJWaWV3LgotICAgIHJldHVybiBsaW5lYWdlT2ZUeXBl PFJlbmRlckJveD4oY29uc3RfY2FzdDxSZW5kZXJPYmplY3QmPigqdGhpcykpLmZpcnN0KCk7Cisg ICAgcmV0dXJuICpsaW5lYWdlT2ZUeXBlPFJlbmRlckJveD4oY29uc3RfY2FzdDxSZW5kZXJPYmpl Y3QmPigqdGhpcykpLmZpcnN0KCk7CiB9CiAKIFJlbmRlckJveE1vZGVsT2JqZWN0KiBSZW5kZXJP YmplY3Q6OmVuY2xvc2luZ0JveE1vZGVsT2JqZWN0KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuaAppbmRleCA2NDkyYTAwZDc5NTEyMjA5ODRiYjIxZTE5MzI2Njdm YjJiODlmZmY4Li4wZWE0NDdmNzczZmUwNDcyMDM0MWRmNmNjYTg5MGJlY2QxZDU2ZDMyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC0yMDYsNyArMjA2LDcgQEAg cHVibGljOgogICAgIGJvb2wgc2Nyb2xsUmVjdFRvVmlzaWJsZShjb25zdCBMYXlvdXRSZWN0Jiwg Y29uc3QgU2Nyb2xsQWxpZ25tZW50JiBhbGlnblggPSBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduQ2Vu dGVySWZOZWVkZWQsIGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25ZID0gU2Nyb2xsQWxpZ25t ZW50OjphbGlnbkNlbnRlcklmTmVlZGVkKTsKIAogICAgIC8vIENvbnZlbmllbmNlIGZ1bmN0aW9u IGZvciBnZXR0aW5nIHRvIHRoZSBuZWFyZXN0IGVuY2xvc2luZyBib3ggb2YgYSBSZW5kZXJPYmpl Y3QuCi0gICAgUmVuZGVyQm94KiBlbmNsb3NpbmdCb3goKSBjb25zdDsKKyAgICBSZW5kZXJCb3gm IGVuY2xvc2luZ0JveCgpIGNvbnN0OwogICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBlbmNsb3Np bmdCb3hNb2RlbE9iamVjdCgpIGNvbnN0OwogCiAgICAgYm9vbCBmaXhlZFBvc2l0aW9uZWRXaXRo TmFtZWRGbG93Q29udGFpbmluZ0Jsb2NrKCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyU2Nyb2xsYmFyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCmluZGV4IGQ3ZWNiOWY1NDk2NzA4YWMwZjIwMzU2ZjA4 M2FiY2I5NTU3ZmY5YTguLjA0YTZhOGE3MWMxMDczZTY0ZjA5MzI5NzA1ZjA4MmQ3YjhhY2JlMzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTY3JvbGxiYXIuY3BwCkBAIC03 Nyw3ICs3Nyw5IEBAIFJlbmRlckJveCogUmVuZGVyU2Nyb2xsYmFyOjpvd25pbmdSZW5kZXJlcigp IGNvbnN0CiAgICAgICAgIHJldHVybiBjdXJyZW50UmVuZGVyZXI7CiAgICAgfQogICAgIEFTU0VS VChtX293bmVyRWxlbWVudCk7Ci0gICAgcmV0dXJuIG1fb3duZXJFbGVtZW50LT5yZW5kZXJlcigp ID8gbV9vd25lckVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0JveCgpIDogbnVsbHB0cjsK KyAgICBpZiAobV9vd25lckVsZW1lbnQtPnJlbmRlcmVyKCkpCisgICAgICAgIHJldHVybiAmbV9v d25lckVsZW1lbnQtPnJlbmRlcmVyKCktPmVuY2xvc2luZ0JveCgpOworICAgIHJldHVybiBudWxs cHRyOwogfQogCiB2b2lkIFJlbmRlclNjcm9sbGJhcjo6c2V0UGFyZW50KFNjcm9sbFZpZXcqIHBh cmVudCkK