232528 2021-10-30 02:00:58 -0700 Migrate the first few callers from ImageBuffer::truncatedLogicalSize() to ImageBuffer::logicalSize() 2021-10-30 20:22:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 225377 1 mmaxfield mmaxfield changseok dino esprehn+autocc ews-watchlist fmalita glenn gyuyoung.kim heycam kondapallykalyan pdr sabouhallawa schenney sergio thorton webkit-bug-importer oldest_to_newest 1810408 0 mmaxfield 2021-10-30 02:00:58 -0700 Migrate the first few callers from ImageBuffer::truncatedLogicalSize() to ImageBUffer::logicalSize() 1810409 1 442907 mmaxfield 2021-10-30 02:04:00 -0700 Created attachment 442907 Patch 1810410 2 webkit-bug-importer 2021-10-30 02:04:41 -0700 <rdar://problem/84836309> 1810451 3 442907 heycam 2021-10-30 14:40:54 -0700 Comment on attachment 442907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442907&action=review > Source/WebCore/ChangeLog:3 > + Migrate the first few callers from ImageBuffer::truncatedLogicalSize() to ImageBUffer::logicalSize() "ImageBuffer::logicalSize()" > Source/WebCore/ChangeLog:10 > + These are the callers which seem obviously correct to migrate from truncatedLogicalSize() to logicalSize(), > + because these are the callers that immediately cast the result to FloatSize. That means, before this patch, > + these callers are going from float -> int -> float. Can you describe in here why we are making this change? I gather it's something like "truncatedLogicalSize() never makes sense, because of XX reasons". And maybe reference bug 225377, like you did in the bug 232515 ChangeLog. > Source/WebKit/ChangeLog:3 > + Migrate the first few callers from ImageBuffer::truncatedLogicalSize() to ImageBUffer::logicalSize() "ImageBuffer::logicalSize()" > Source/WebCore/platform/graphics/filters/FEBlend.cpp:73 > + filterContext.drawImageBuffer(*imageBuffer, drawingRegionOfInputImage(in->absolutePaintRect()), { { }, imageBuffer->truncatedLogicalSize() }, { CompositeOperator::SourceOver, m_mode }); This is constructing a FloatRect directly now. Did you mean to change this to logicalSize()? 1810453 4 442907 mmaxfield 2021-10-30 14:50:50 -0700 Comment on attachment 442907 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442907&action=review >> Source/WebCore/platform/graphics/filters/FEBlend.cpp:73 >> + filterContext.drawImageBuffer(*imageBuffer, drawingRegionOfInputImage(in->absolutePaintRect()), { { }, imageBuffer->truncatedLogicalSize() }, { CompositeOperator::SourceOver, m_mode }); > > This is constructing a FloatRect directly now. Did you mean to change this to logicalSize()? Yep. Will fix. 1810475 5 442924 mmaxfield 2021-10-30 19:46:25 -0700 Created attachment 442924 Patch for committing 1810479 6 ews-feeder 2021-10-30 20:22:53 -0700 Committed r285090 (243732@main): <https://commits.webkit.org/243732@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442924. 442907 2021-10-30 02:04:00 -0700 2021-10-30 15:47:02 -0700 Patch bug-232528-20211030020359.patch text/plain 12760 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmZjYjJjODFkM2Y1OGZk ZjA0N2RiMjNhYWU1NzM4M2Q5MTQyODdiNS4uZWFiNjZmMzUwZjg0NDljNmY5ZjBlOGZiODJkNTcw NTcyMTcyODExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWlncmF0ZSB0 aGUgZmlyc3QgZmV3IGNhbGxlcnMgZnJvbSBJbWFnZUJ1ZmZlcjo6dHJ1bmNhdGVkTG9naWNhbFNp emUoKSB0byBJbWFnZUJVZmZlcjo6bG9naWNhbFNpemUoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNTI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlc2UgYXJlIHRoZSBjYWxsZXJzIHdoaWNoIHNl ZW0gb2J2aW91c2x5IGNvcnJlY3QgdG8gbWlncmF0ZSBmcm9tIHRydW5jYXRlZExvZ2ljYWxTaXpl KCkgdG8gbG9naWNhbFNpemUoKSwKKyAgICAgICAgYmVjYXVzZSB0aGVzZSBhcmUgdGhlIGNhbGxl cnMgdGhhdCBpbW1lZGlhdGVseSBjYXN0IHRoZSByZXN1bHQgdG8gRmxvYXRTaXplLiBUaGF0IG1l YW5zLCBiZWZvcmUgdGhpcyBwYXRjaCwKKyAgICAgICAgdGhlc2UgY2FsbGVycyBhcmUgZ29pbmcg ZnJvbSBmbG9hdCAtPiBpbnQgLT4gZmxvYXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2VCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Ojpk cmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rp c3BsYXlsaXN0cy9EaXNwbGF5TGlzdEltYWdlQnVmZmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpE aXNwbGF5TGlzdDo6SW1hZ2VCdWZmZXI6OkltYWdlQnVmZmVyKToKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9maWx0ZXJzL0ZFQmxlbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RkVCbGVu ZDo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL0ZFQ29tcG9zaXRlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZFQ29tcG9zaXRlOjpw bGF0Zm9ybUFwcGx5U29mdHdhcmUpOgorICAgICAgICAqIHJlbmRlcmluZy9DU1NGaWx0ZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q1NTRmlsdGVyOjphbGxvY2F0ZUJhY2tpbmdTdG9yZUlmTmVl ZGVkKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jlc291cmNlUGF0dGVybi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm46OmJ1aWxkUGF0 dGVybik6CisKIDIwMjEtMTAtMjkgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAg ICAgICAgIFtMRkNdW0lGQ10gTW92ZSBJbmxpbmVUZXh0SXRlbSBjb25zdHJ1Y3Rpb24gdG8gSW5s aW5lSXRlbXNCdWlsZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhhNzc1YmNmZTkxZmQxNzA4OTU3ZGMzNDM2NWQ4 Y2U2YjllMmUzYTIuLmZhYmNjNzY4ZGI3MzY0YTFmNzM2MzQ4M2IxMmFkZmY3M2EzOTA5NWIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTAtMzAgIE15bGVzIEMuIE1heGZpZWxkICA8 bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBNaWdyYXRlIHRoZSBmaXJzdCBmZXcgY2Fs bGVycyBmcm9tIEltYWdlQnVmZmVyOjp0cnVuY2F0ZWRMb2dpY2FsU2l6ZSgpIHRvIEltYWdlQlVm ZmVyOjpsb2dpY2FsU2l6ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzI1MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJv eHkuaDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW1hZ2VCdWZmZXJQcm94eTo6UmVtb3RlSW1h Z2VCdWZmZXJQcm94eSk6CisKIDIwMjEtMTAtMjkgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dMSUJdW1NPVVBdIFVuaWZ5IG1lbW9yeVByZXNzdXJlTW9uaXRv ckRpc2FibGVkIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAppbmRleCA2MTYwY2JmYTAyMjUzMmMwZjE2 ZTJhNzAzZTA0Mzk3NmM5MjEwYzNkLi5iMjIxOGZhYTNiZDU2YjM5NTQ0MTQxNWZkOGUxZjY5Njcw OWVkZmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5jcHAKQEAgLTU5MSwxMiArNTkxLDEyIEBAIEltYWdlRHJhd1Jlc3VsdCBH cmFwaGljc0NvbnRleHQ6OmRyYXdUaWxlZEltYWdlKEltYWdlJiBpbWFnZSwgY29uc3QgRmxvYXRS ZWN0JiBkCiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIoSW1hZ2VCdWZm ZXImIGltYWdlLCBjb25zdCBGbG9hdFBvaW50JiBkZXN0aW5hdGlvbiwgY29uc3QgSW1hZ2VQYWlu dGluZ09wdGlvbnMmIGltYWdlUGFpbnRpbmdPcHRpb25zKQogewotICAgIGRyYXdJbWFnZUJ1ZmZl cihpbWFnZSwgRmxvYXRSZWN0KGRlc3RpbmF0aW9uLCBpbWFnZS50cnVuY2F0ZWRMb2dpY2FsU2l6 ZSgpKSwgRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgaW1hZ2UudHJ1bmNhdGVkTG9naWNhbFNpemUo KSksIGltYWdlUGFpbnRpbmdPcHRpb25zKTsKKyAgICBkcmF3SW1hZ2VCdWZmZXIoaW1hZ2UsIEZs b2F0UmVjdChkZXN0aW5hdGlvbiwgaW1hZ2UubG9naWNhbFNpemUoKSksIEZsb2F0UmVjdCh7IH0s IGltYWdlLmxvZ2ljYWxTaXplKCkpLCBpbWFnZVBhaW50aW5nT3B0aW9ucyk7CiB9CiAKIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIoSW1hZ2VCdWZmZXImIGltYWdlLCBjb25z dCBGbG9hdFJlY3QmIGRlc3RpbmF0aW9uLCBjb25zdCBJbWFnZVBhaW50aW5nT3B0aW9ucyYgaW1h Z2VQYWludGluZ09wdGlvbnMpCiB7Ci0gICAgZHJhd0ltYWdlQnVmZmVyKGltYWdlLCBkZXN0aW5h dGlvbiwgRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgRmxvYXRTaXplKGltYWdlLnRydW5jYXRlZExv Z2ljYWxTaXplKCkpKSwgaW1hZ2VQYWludGluZ09wdGlvbnMpOworICAgIGRyYXdJbWFnZUJ1ZmZl cihpbWFnZSwgZGVzdGluYXRpb24sIEZsb2F0UmVjdCh7IH0sIGltYWdlLmxvZ2ljYWxTaXplKCkp LCBpbWFnZVBhaW50aW5nT3B0aW9ucyk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3 SW1hZ2VCdWZmZXIoSW1hZ2VCdWZmZXImIGltYWdlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RpbmF0 aW9uLCBjb25zdCBGbG9hdFJlY3QmIHNvdXJjZSwgY29uc3QgSW1hZ2VQYWludGluZ09wdGlvbnMm IG9wdGlvbnMpCkBAIC02MDksMTYgKzYwOSwxNiBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJh d0NvbnN1bWluZ0ltYWdlQnVmZmVyKFJlZlB0cjxJbWFnZUJ1ZmZlcj4gaW1hZ2UsIGNvbnN0CiB7 CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgcmV0dXJuOwotICAgIEludFNpemUgaW1hZ2VMb2dp Y2FsU2l6ZSA9IGltYWdlLT50cnVuY2F0ZWRMb2dpY2FsU2l6ZSgpOwotICAgIGRyYXdDb25zdW1p bmdJbWFnZUJ1ZmZlcihXVEZNb3ZlKGltYWdlKSwgRmxvYXRSZWN0KGRlc3RpbmF0aW9uLCBpbWFn ZUxvZ2ljYWxTaXplKSwgRmxvYXRSZWN0KEZsb2F0UG9pbnQoKSwgaW1hZ2VMb2dpY2FsU2l6ZSks IGltYWdlUGFpbnRpbmdPcHRpb25zKTsKKyAgICBhdXRvIGltYWdlTG9naWNhbFNpemUgPSBpbWFn ZS0+bG9naWNhbFNpemUoKTsKKyAgICBkcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIoV1RGTW92ZShp bWFnZSksIEZsb2F0UmVjdChkZXN0aW5hdGlvbiwgaW1hZ2VMb2dpY2FsU2l6ZSksIEZsb2F0UmVj dCh7IH0sIGltYWdlTG9naWNhbFNpemUpLCBpbWFnZVBhaW50aW5nT3B0aW9ucyk7CiB9CiAKIHZv aWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIoUmVmUHRyPEltYWdl QnVmZmVyPiBpbWFnZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0aW5hdGlvbiwgY29uc3QgSW1hZ2VQ YWludGluZ09wdGlvbnMmIGltYWdlUGFpbnRpbmdPcHRpb25zKQogewogICAgIGlmICghaW1hZ2Up CiAgICAgICAgIHJldHVybjsKLSAgICBJbnRTaXplIGltYWdlTG9naWNhbFNpemUgPSBpbWFnZS0+ dHJ1bmNhdGVkTG9naWNhbFNpemUoKTsKLSAgICBkcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIoV1RG TW92ZShpbWFnZSksIGRlc3RpbmF0aW9uLCBGbG9hdFJlY3QoRmxvYXRQb2ludCgpLCBGbG9hdFNp emUoaW1hZ2VMb2dpY2FsU2l6ZSkpLCBpbWFnZVBhaW50aW5nT3B0aW9ucyk7CisgICAgYXV0byBp bWFnZUxvZ2ljYWxTaXplID0gaW1hZ2UtPmxvZ2ljYWxTaXplKCk7CisgICAgZHJhd0NvbnN1bWlu Z0ltYWdlQnVmZmVyKFdURk1vdmUoaW1hZ2UpLCBkZXN0aW5hdGlvbiwgRmxvYXRSZWN0KHsgfSwg aW1hZ2VMb2dpY2FsU2l6ZSksIGltYWdlUGFpbnRpbmdPcHRpb25zKTsKIH0KIAogdm9pZCBHcmFw aGljc0NvbnRleHQ6OmRyYXdDb25zdW1pbmdJbWFnZUJ1ZmZlcihSZWZQdHI8SW1hZ2VCdWZmZXI+ IGltYWdlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RpbmF0aW9uLCBjb25zdCBGbG9hdFJlY3QmIHNv dXJjZSwgY29uc3QgSW1hZ2VQYWludGluZ09wdGlvbnMmIG9wdGlvbnMpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJ bWFnZUJ1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxp c3RzL0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXIuaAppbmRleCAzZGNhOTdjZmViYzA3NzNkNzAzYjY1 NzJlOTMzMzU1ZDRjMzI1ODMyLi43ZWEyYTE0Yzc4ZjM4NWZhN2VmZDk5NjViOWUyYzJkOWQ1MDAy MTAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5 bGlzdHMvRGlzcGxheUxpc3RJbWFnZUJ1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEltYWdlQnVmZmVyLmgKQEAgLTUy LDcgKzUyLDcgQEAgcHVibGljOgogCiAgICAgSW1hZ2VCdWZmZXIoY29uc3QgSW1hZ2VCdWZmZXJC YWNrZW5kOjpQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBzdGQ6OnVuaXF1ZV9wdHI8QmFja2VuZFR5 cGU+JiYgYmFja2VuZCkKICAgICAgICAgOiBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZlcihwYXJhbWV0 ZXJzLCBXVEZNb3ZlKGJhY2tlbmQpKQotICAgICAgICAsIG1fZHJhd2luZ0NvbnRleHQodHJ1bmNh dGVkTG9naWNhbFNpemUoKSwgYmFzZVRyYW5zZm9ybSgpKQorICAgICAgICAsIG1fZHJhd2luZ0Nv bnRleHQobG9naWNhbFNpemUoKSwgYmFzZVRyYW5zZm9ybSgpKQogICAgICAgICAsIG1fd3JpdGlu Z0NsaWVudChtYWtlVW5pcXVlPEluTWVtb3J5RGlzcGxheUxpc3Q6OldyaXRpbmdDbGllbnQ+KCkp CiAgICAgICAgICwgbV9yZWFkaW5nQ2xpZW50KG1ha2VVbmlxdWU8SW5NZW1vcnlEaXNwbGF5TGlz dDo6UmVhZGluZ0NsaWVudD4oKSkKICAgICB7CkBAIC02Miw3ICs2Miw3IEBAIHB1YmxpYzoKIAog ICAgIEltYWdlQnVmZmVyKGNvbnN0IEltYWdlQnVmZmVyQmFja2VuZDo6UGFyYW1ldGVycyYgcGFy YW1ldGVycywgUmVjb3JkZXJJbXBsOjpEZWxlZ2F0ZSogZGVsZWdhdGUgPSBudWxscHRyKQogICAg ICAgICA6IEJhc2VDb25jcmV0ZUltYWdlQnVmZmVyKHBhcmFtZXRlcnMpCi0gICAgICAgICwgbV9k cmF3aW5nQ29udGV4dCh0cnVuY2F0ZWRMb2dpY2FsU2l6ZSgpLCBiYXNlVHJhbnNmb3JtKCksIGRl bGVnYXRlKQorICAgICAgICAsIG1fZHJhd2luZ0NvbnRleHQobG9naWNhbFNpemUoKSwgYmFzZVRy YW5zZm9ybSgpLCBkZWxlZ2F0ZSkKICAgICAgICAgLCBtX3dyaXRpbmdDbGllbnQobWFrZVVuaXF1 ZTxJbk1lbW9yeURpc3BsYXlMaXN0OjpXcml0aW5nQ2xpZW50PigpKQogICAgICAgICAsIG1fcmVh ZGluZ0NsaWVudChtYWtlVW5pcXVlPEluTWVtb3J5RGlzcGxheUxpc3Q6OlJlYWRpbmdDbGllbnQ+ KCkpCiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZmlsdGVycy9GRUJsZW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Zp bHRlcnMvRkVCbGVuZC5jcHAKaW5kZXggY2I4M2E4NjEwMzMzMzY0YTU4NTAwZTE5MzA2YzMzY2Jm N2I2YWIxNS4uZjJjYzBkZDNiZGYyYzg4Y2FkZjcyMjlhNTJkNDJlNDRjNmU5YjEwYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUJsZW5kLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQmxlbmQu Y3BwCkBAIC03MCw3ICs3MCw3IEBAIHZvaWQgRkVCbGVuZDo6cGxhdGZvcm1BcHBseVNvZnR3YXJl KCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgZmlsdGVyQ29udGV4dC5kcmF3SW1hZ2VCdWZmZXIo KmltYWdlQnVmZmVyMiwgZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbjItPmFic29sdXRlUGFp bnRSZWN0KCkpKTsKLSAgICBmaWx0ZXJDb250ZXh0LmRyYXdJbWFnZUJ1ZmZlcigqaW1hZ2VCdWZm ZXIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4tPmFic29sdXRlUGFpbnRSZWN0KCkpLCBJ bnRSZWN0KEludFBvaW50KCksIGltYWdlQnVmZmVyLT50cnVuY2F0ZWRMb2dpY2FsU2l6ZSgpKSwg eyBDb21wb3NpdGVPcGVyYXRvcjo6U291cmNlT3ZlciwgbV9tb2RlIH0pOworICAgIGZpbHRlckNv bnRleHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1ZmZlciwgZHJhd2luZ1JlZ2lvbk9mSW5wdXRJ bWFnZShpbi0+YWJzb2x1dGVQYWludFJlY3QoKSksIHsgeyB9LCBpbWFnZUJ1ZmZlci0+dHJ1bmNh dGVkTG9naWNhbFNpemUoKSB9LCB7IENvbXBvc2l0ZU9wZXJhdG9yOjpTb3VyY2VPdmVyLCBtX21v ZGUgfSk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZmlsdGVycy9GRUNvbXBvc2l0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29tcG9zaXRlLmNwcAppbmRleCBmOGE2NDc5MGMxY2I0MDkw YTlmNjJhOTFlNDVlMWRiNTIzZjljYjVlLi44MzM1MzA5MDgxYTI2YmEyYzMxYzNiZGFjODg4NjY5 ZTI4ZTM0NTZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL0ZFQ29tcG9zaXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9maWx0ZXJzL0ZFQ29tcG9zaXRlLmNwcApAQCAtMjc4LDE5ICsyNzgsMTkgQEAgdm9pZCBG RUNvbXBvc2l0ZTo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKCkKICAgICB9CiAgICAgY2FzZSBGRUNP TVBPU0lURV9PUEVSQVRPUl9PVVQ6CiAgICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVm ZmVyKCppbWFnZUJ1ZmZlciwgZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbi0+YWJzb2x1dGVQ YWludFJlY3QoKSkpOwotICAgICAgICBmaWx0ZXJDb250ZXh0LmRyYXdJbWFnZUJ1ZmZlcigqaW1h Z2VCdWZmZXIyLCBkcmF3aW5nUmVnaW9uT2ZJbnB1dEltYWdlKGluMi0+YWJzb2x1dGVQYWludFJl Y3QoKSksIEludFJlY3QoSW50UG9pbnQoKSwgaW1hZ2VCdWZmZXIyLT50cnVuY2F0ZWRMb2dpY2Fs U2l6ZSgpKSwgQ29tcG9zaXRlT3BlcmF0b3I6OkRlc3RpbmF0aW9uT3V0KTsKKyAgICAgICAgZmls dGVyQ29udGV4dC5kcmF3SW1hZ2VCdWZmZXIoKmltYWdlQnVmZmVyMiwgZHJhd2luZ1JlZ2lvbk9m SW5wdXRJbWFnZShpbjItPmFic29sdXRlUGFpbnRSZWN0KCkpLCB7IHsgfSwgaW1hZ2VCdWZmZXIy LT5sb2dpY2FsU2l6ZSgpIH0sIENvbXBvc2l0ZU9wZXJhdG9yOjpEZXN0aW5hdGlvbk91dCk7CiAg ICAgICAgIGJyZWFrOwogICAgIGNhc2UgRkVDT01QT1NJVEVfT1BFUkFUT1JfQVRPUDoKICAgICAg ICAgZmlsdGVyQ29udGV4dC5kcmF3SW1hZ2VCdWZmZXIoKmltYWdlQnVmZmVyMiwgZHJhd2luZ1Jl Z2lvbk9mSW5wdXRJbWFnZShpbjItPmFic29sdXRlUGFpbnRSZWN0KCkpKTsKLSAgICAgICAgZmls dGVyQ29udGV4dC5kcmF3SW1hZ2VCdWZmZXIoKmltYWdlQnVmZmVyLCBkcmF3aW5nUmVnaW9uT2ZJ bnB1dEltYWdlKGluLT5hYnNvbHV0ZVBhaW50UmVjdCgpKSwgSW50UmVjdChJbnRQb2ludCgpLCBp bWFnZUJ1ZmZlci0+dHJ1bmNhdGVkTG9naWNhbFNpemUoKSksIENvbXBvc2l0ZU9wZXJhdG9yOjpT b3VyY2VBdG9wKTsKKyAgICAgICAgZmlsdGVyQ29udGV4dC5kcmF3SW1hZ2VCdWZmZXIoKmltYWdl QnVmZmVyLCBkcmF3aW5nUmVnaW9uT2ZJbnB1dEltYWdlKGluLT5hYnNvbHV0ZVBhaW50UmVjdCgp KSwgeyB7IH0sIGltYWdlQnVmZmVyLT5sb2dpY2FsU2l6ZSgpIH0sIENvbXBvc2l0ZU9wZXJhdG9y OjpTb3VyY2VBdG9wKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBGRUNPTVBPU0lURV9PUEVS QVRPUl9YT1I6CiAgICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1 ZmZlcjIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4yLT5hYnNvbHV0ZVBhaW50UmVjdCgp KSk7Ci0gICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1ZmZlciwg ZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbi0+YWJzb2x1dGVQYWludFJlY3QoKSksIEludFJl Y3QoSW50UG9pbnQoKSwgaW1hZ2VCdWZmZXItPnRydW5jYXRlZExvZ2ljYWxTaXplKCkpLCBDb21w b3NpdGVPcGVyYXRvcjo6WE9SKTsKKyAgICAgICAgZmlsdGVyQ29udGV4dC5kcmF3SW1hZ2VCdWZm ZXIoKmltYWdlQnVmZmVyLCBkcmF3aW5nUmVnaW9uT2ZJbnB1dEltYWdlKGluLT5hYnNvbHV0ZVBh aW50UmVjdCgpKSwgeyB7IH0sIGltYWdlQnVmZmVyLT5sb2dpY2FsU2l6ZSgpIH0sIENvbXBvc2l0 ZU9wZXJhdG9yOjpYT1IpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEZFQ09NUE9TSVRFX09Q RVJBVE9SX0xJR0hURVI6CiAgICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVmZmVyKCpp bWFnZUJ1ZmZlcjIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4yLT5hYnNvbHV0ZVBhaW50 UmVjdCgpKSk7Ci0gICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1 ZmZlciwgZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbi0+YWJzb2x1dGVQYWludFJlY3QoKSks IEludFJlY3QoSW50UG9pbnQoKSwgaW1hZ2VCdWZmZXItPnRydW5jYXRlZExvZ2ljYWxTaXplKCkp LCBDb21wb3NpdGVPcGVyYXRvcjo6UGx1c0xpZ2h0ZXIpOworICAgICAgICBmaWx0ZXJDb250ZXh0 LmRyYXdJbWFnZUJ1ZmZlcigqaW1hZ2VCdWZmZXIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2Uo aW4tPmFic29sdXRlUGFpbnRSZWN0KCkpLCB7IHsgfSwgaW1hZ2VCdWZmZXItPmxvZ2ljYWxTaXpl KCkgfSwgQ29tcG9zaXRlT3BlcmF0b3I6OlBsdXNMaWdodGVyKTsKICAgICAgICAgYnJlYWs7CiAg ICAgZGVmYXVsdDoKICAgICAgICAgYnJlYWs7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvQ1NTRmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9DU1NGaWx0 ZXIuY3BwCmluZGV4IGIyNWIxOTNhMTBjZGVlNjMxNTliMDIzNGEyMmU4NWM2MmZlODVkNDIuLjlk NmMyY2RkMDVmOTQ5YjYzNGNhZmExN2FjMTdkYjVjMDJiNWI2MTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9DU1NGaWx0ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9DU1NGaWx0ZXIuY3BwCkBAIC0zMzEsOCArMzMxLDggQEAgdm9pZCBDU1NGaWx0ZXI6 OmFsbG9jYXRlQmFja2luZ1N0b3JlSWZOZWVkZWQoY29uc3QgR3JhcGhpY3NDb250ZXh0JiB0YXJn ZXRDb250ZXgKICAgICBpZiAobV9ncmFwaGljc0J1ZmZlckF0dGFjaGVkKQogICAgICAgICByZXR1 cm47CiAKLSAgICBJbnRTaXplIGxvZ2ljYWxTaXplIHsgbV9zb3VyY2VEcmF3aW5nUmVnaW9uLnNp emUoKSB9OwotICAgIGlmICghc291cmNlSW1hZ2UoKSB8fCBzb3VyY2VJbWFnZSgpLT50cnVuY2F0 ZWRMb2dpY2FsU2l6ZSgpICE9IGxvZ2ljYWxTaXplKSB7CisgICAgYXV0byBsb2dpY2FsU2l6ZSA9 IG1fc291cmNlRHJhd2luZ1JlZ2lvbi5zaXplKCk7CisgICAgaWYgKCFzb3VyY2VJbWFnZSgpIHx8 IHNvdXJjZUltYWdlKCktPmxvZ2ljYWxTaXplKCkgIT0gbG9naWNhbFNpemUpIHsKICNpZiBVU0Uo RElSRUNUMkQpCiAgICAgICAgIHNldFNvdXJjZUltYWdlKEltYWdlQnVmZmVyOjpjcmVhdGUobG9n aWNhbFNpemUsIHJlbmRlcmluZ01vZGUoKSwgJnRhcmdldENvbnRleHQsIGZpbHRlclNjYWxlKCks IERlc3RpbmF0aW9uQ29sb3JTcGFjZTo6U1JHQigpLCBQaXhlbEZvcm1hdDo6QkdSQTgpKTsKICNl bHNlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNWR1Jl c291cmNlUGF0dGVybi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1JlbmRlclNW R1Jlc291cmNlUGF0dGVybi5jcHAKaW5kZXggZDlmNjkxZDFmOTMxNjdlYmI5NTAwMjY1YWE2NjBk ZTEzZGQ3YjlmYi4uMmM2MDU1OTBkYjQwM2VmNDRiZjE3OGJjMDdjODQxNjA0OWMwOTUxYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9SZW5kZXJTVkdSZXNvdXJjZVBh dHRlcm4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZHUmVz b3VyY2VQYXR0ZXJuLmNwcApAQCAtMTExLDcgKzExMSw3IEBAIFBhdHRlcm5EYXRhKiBSZW5kZXJT VkdSZXNvdXJjZVBhdHRlcm46OmJ1aWxkUGF0dGVybihSZW5kZXJFbGVtZW50JiByZW5kZXJlciwg T3B0CiAgICAgaWYgKCF0aWxlSW1hZ2UpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAg Y29uc3QgSW50U2l6ZSB0aWxlSW1hZ2VTaXplID0gdGlsZUltYWdlLT50cnVuY2F0ZWRMb2dpY2Fs U2l6ZSgpOworICAgIGF1dG8gdGlsZUltYWdlU2l6ZSA9IHRpbGVJbWFnZS0+bG9naWNhbFNpemUo KTsKIAogICAgIGF1dG8gY29waWVkSW1hZ2UgPSBJbWFnZUJ1ZmZlcjo6c2lua0ludG9OYXRpdmVJ bWFnZShXVEZNb3ZlKHRpbGVJbWFnZSkpOwogICAgIGlmICghY29waWVkSW1hZ2UpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVm ZmVyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3Rl SW1hZ2VCdWZmZXJQcm94eS5oCmluZGV4IDA1ZDRmMTk2MTRhYzk0MmY4YWIwNGViMTQ4MmRmMzQw NzkxMmM4NjAuLjg1ZGY3Yjk4ZjRmY2RmNzAyMjczOTQ0Zjg3MGY0ODQ4NGE1ZGEzZGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VC dWZmZXJQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv UmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCkBAIC0xMDEsNyArMTAxLDcgQEAgcHJvdGVjdGVkOgog ICAgIFJlbW90ZUltYWdlQnVmZmVyUHJveHkoY29uc3QgV2ViQ29yZTo6SW1hZ2VCdWZmZXJCYWNr ZW5kOjpQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzLCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkm IHJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSkKICAgICAgICAgOiBCYXNlQ29uY3JldGVJbWFn ZUJ1ZmZlcihwYXJhbWV0ZXJzKQogICAgICAgICAsIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5KHJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSkKLSAgICAgICAgLCBtX3JlbW90ZURpc3Bs YXlMaXN0KCp0aGlzLCByZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHksIHsgeyB9LCBCYXNlQ29u Y3JldGVJbWFnZUJ1ZmZlcjo6dHJ1bmNhdGVkTG9naWNhbFNpemUoKSB9LCBCYXNlQ29uY3JldGVJ bWFnZUJ1ZmZlcjo6YmFzZVRyYW5zZm9ybSgpKQorICAgICAgICAsIG1fcmVtb3RlRGlzcGxheUxp c3QoKnRoaXMsIHJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSwgeyB7IH0sIEJhc2VDb25jcmV0 ZUltYWdlQnVmZmVyOjpsb2dpY2FsU2l6ZSgpIH0sIEJhc2VDb25jcmV0ZUltYWdlQnVmZmVyOjpi YXNlVHJhbnNmb3JtKCkpCiAgICAgewogICAgICAgICBBU1NFUlQobV9yZW1vdGVSZW5kZXJpbmdC YWNrZW5kUHJveHkpOwogICAgICAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS0+cmVt b3RlUmVzb3VyY2VDYWNoZVByb3h5KCkuY2FjaGVJbWFnZUJ1ZmZlcigqdGhpcyk7Cg== 442924 2021-10-30 19:46:25 -0700 2021-10-30 20:22:55 -0700 Patch for committing bug-232528-20211030194624.patch text/plain 13340 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjg4MmVlNjM5ZjFkNTk0 MTUxM2QwZDBiOGVjNDY1MzU4YzgxNjEwNS4uYWEwMWU2NjVkOWVhYzYxYWExNzU4YjVhZGUyMzE2 OGMzNDgzMjIyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEwLTMwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTWlncmF0ZSB0 aGUgZmlyc3QgZmV3IGNhbGxlcnMgZnJvbSBJbWFnZUJ1ZmZlcjo6dHJ1bmNhdGVkTG9naWNhbFNp emUoKSB0byBJbWFnZUJ1ZmZlcjo6bG9naWNhbFNpemUoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyNTI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg VGltIEhvcnRvbi4KKworICAgICAgICBUaGVzZSBhcmUgdGhlIGNhbGxlcnMgd2hpY2ggc2VlbSBv YnZpb3VzbHkgY29ycmVjdCB0byBtaWdyYXRlIGZyb20gdHJ1bmNhdGVkTG9naWNhbFNpemUoKSB0 byBsb2dpY2FsU2l6ZSgpLAorICAgICAgICBiZWNhdXNlIHRoZXNlIGFyZSB0aGUgY2FsbGVycyB0 aGF0IGltbWVkaWF0ZWx5IGNhc3QgdGhlIHJlc3VsdCB0byBGbG9hdFNpemUuIFRoYXQgbWVhbnMs IGJlZm9yZSB0aGlzIHBhdGNoLAorICAgICAgICB0aGVzZSBjYWxsZXJzIGFyZSBnb2luZyBmcm9t IGZsb2F0IC0+IGludCAtPiBmbG9hdC4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIHRoZSBmb3Vy dGggc3RlcCBpbiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI1Mzc3 LiBUaGVyZSBpcyBubyBzaXR1YXRpb24gd2hlcmUKKyAgICAgICAgdHJ1bmNhdGluZyB0aGUgbG9n aWNhbCBzaXplIGlzIG1lYW5pbmdmdWwgLSB3ZSBlaXRoZXIgd2FudCB0aGUgZmxvYXQgbG9naWNh bCBzaXplLCBvciB3ZSB3YW50IHRoZSBwaHlzaWNhbAorICAgICAgICBudW1iZXIgb2YgdGV4ZWxz IGluIHRoZSBpbWFnZSAod2hpY2ggaXMgdGhlIGxvZ2ljYWwgc2l6ZSwgdGltZXMgdGhlIHJlc29s dXRpb24sIHJvdW5kZWQgdXAgdG8gYW4gaW50IHNpemUpLgorICAgICAgICBFdmVudHVhbGx5LCB3 ZSBzaG91bGQgbW92ZSBhbGwgY2FsbGVycyBvZmYgb2YgdHJ1bmNhdGVkTG9naWNhbFNpemUoKSBh bmQgb24gdG8gZWl0aGVyIGxvZ2ljYWxTaXplKCkgb3IKKyAgICAgICAgYSB5ZXQtdG8tYmUtd3Jp dHRlbiBwaHlzaWNhbFNpemUoKS90ZXhlbENvdW50KCkvYmlrZXNoZWROYW1lKCkuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIpOgorICAgICAgICAoV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0OjpkcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEltYWdlQnVmZmVyLmg6 CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6SW1hZ2VCdWZmZXI6OkltYWdlQnVmZmVy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQmxlbmQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RkVCbGVuZDo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQ29tcG9zaXRlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZFQ29tcG9zaXRlOjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUpOgorICAgICAgICAqIHJl bmRlcmluZy9DU1NGaWx0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRmlsdGVyOjphbGxv Y2F0ZUJhY2tpbmdTdG9yZUlmTmVlZGVkKToKKyAgICAgICAgKiByZW5kZXJpbmcvc3ZnL1JlbmRl clNWR1Jlc291cmNlUGF0dGVybi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTVkdSZXNv dXJjZVBhdHRlcm46OmJ1aWxkUGF0dGVybik6CisKIDIwMjEtMTAtMzAgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbIEJpZ1N1ciB3azIgRGVidWcgYXJtNjQgXSB3 ZWJhdWRpby9BdWRpb0J1ZmZlclNvdXJjZS9hdWRpb2J1ZmZlcnNvdXJjZS1wbGF5YmFja3JhdGUu aHRtbCBpcyBhIGZsYWt5IGNyYXNoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDljNjI3YThiZTNhYTE2MDNiN2MxMDQ3 OTI4NDdlYTczZWI1MzdhZWMuLjEyNDQyYjc3YjcxN2Q1NTk1YzZiY2NiYTk5YTJlMWNiNDIzYTUw ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMTAtMzAgIE15bGVzIEMuIE1heGZp ZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBNaWdyYXRlIHRoZSBmaXJzdCBm ZXcgY2FsbGVycyBmcm9tIEltYWdlQnVmZmVyOjp0cnVuY2F0ZWRMb2dpY2FsU2l6ZSgpIHRvIElt YWdlQnVmZmVyOjpsb2dpY2FsU2l6ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMzI1MjgKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9u LgorCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQ cm94eS5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJbWFnZUJ1ZmZlclByb3h5OjpSZW1vdGVJ bWFnZUJ1ZmZlclByb3h5KToKKwogMjAyMS0xMC0zMCAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4 ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBwcm9jZXNzIHNob3VsZG4ndCBjcmFzaCBp ZiBJbWFnZUJ1ZmZlcjo6ZW5zdXJlQmFja2VuZENyZWF0ZWQoKSBmYWlscwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKaW5kZXgg NjE2MGNiZmEwMjI1MzJjMGYxNmUyYTcwM2UwNDM5NzZjOTIxMGMzZC4uYjIyMThmYWEzYmQ1NmIz OTU0NDE0MTVmZDhlMWY2OTY3MDllZGZkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCkBAIC01OTEsMTIgKzU5MSwxMiBA QCBJbWFnZURyYXdSZXN1bHQgR3JhcGhpY3NDb250ZXh0OjpkcmF3VGlsZWRJbWFnZShJbWFnZSYg aW1hZ2UsIGNvbnN0IEZsb2F0UmVjdCYgZAogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0lt YWdlQnVmZmVyKEltYWdlQnVmZmVyJiBpbWFnZSwgY29uc3QgRmxvYXRQb2ludCYgZGVzdGluYXRp b24sIGNvbnN0IEltYWdlUGFpbnRpbmdPcHRpb25zJiBpbWFnZVBhaW50aW5nT3B0aW9ucykKIHsK LSAgICBkcmF3SW1hZ2VCdWZmZXIoaW1hZ2UsIEZsb2F0UmVjdChkZXN0aW5hdGlvbiwgaW1hZ2Uu dHJ1bmNhdGVkTG9naWNhbFNpemUoKSksIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIGltYWdlLnRy dW5jYXRlZExvZ2ljYWxTaXplKCkpLCBpbWFnZVBhaW50aW5nT3B0aW9ucyk7CisgICAgZHJhd0lt YWdlQnVmZmVyKGltYWdlLCBGbG9hdFJlY3QoZGVzdGluYXRpb24sIGltYWdlLmxvZ2ljYWxTaXpl KCkpLCBGbG9hdFJlY3QoeyB9LCBpbWFnZS5sb2dpY2FsU2l6ZSgpKSwgaW1hZ2VQYWludGluZ09w dGlvbnMpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdl QnVmZmVyJiBpbWFnZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0aW5hdGlvbiwgY29uc3QgSW1hZ2VQ YWludGluZ09wdGlvbnMmIGltYWdlUGFpbnRpbmdPcHRpb25zKQogewotICAgIGRyYXdJbWFnZUJ1 ZmZlcihpbWFnZSwgZGVzdGluYXRpb24sIEZsb2F0UmVjdChGbG9hdFBvaW50KCksIEZsb2F0U2l6 ZShpbWFnZS50cnVuY2F0ZWRMb2dpY2FsU2l6ZSgpKSksIGltYWdlUGFpbnRpbmdPcHRpb25zKTsK KyAgICBkcmF3SW1hZ2VCdWZmZXIoaW1hZ2UsIGRlc3RpbmF0aW9uLCBGbG9hdFJlY3QoeyB9LCBp bWFnZS5sb2dpY2FsU2l6ZSgpKSwgaW1hZ2VQYWludGluZ09wdGlvbnMpOwogfQogCiB2b2lkIEdy YXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdlQnVmZmVyJiBpbWFnZSwgY29uc3Qg RmxvYXRSZWN0JiBkZXN0aW5hdGlvbiwgY29uc3QgRmxvYXRSZWN0JiBzb3VyY2UsIGNvbnN0IElt YWdlUGFpbnRpbmdPcHRpb25zJiBvcHRpb25zKQpAQCAtNjA5LDE2ICs2MDksMTYgQEAgdm9pZCBH cmFwaGljc0NvbnRleHQ6OmRyYXdDb25zdW1pbmdJbWFnZUJ1ZmZlcihSZWZQdHI8SW1hZ2VCdWZm ZXI+IGltYWdlLCBjb25zdAogewogICAgIGlmICghaW1hZ2UpCiAgICAgICAgIHJldHVybjsKLSAg ICBJbnRTaXplIGltYWdlTG9naWNhbFNpemUgPSBpbWFnZS0+dHJ1bmNhdGVkTG9naWNhbFNpemUo KTsKLSAgICBkcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIoV1RGTW92ZShpbWFnZSksIEZsb2F0UmVj dChkZXN0aW5hdGlvbiwgaW1hZ2VMb2dpY2FsU2l6ZSksIEZsb2F0UmVjdChGbG9hdFBvaW50KCks IGltYWdlTG9naWNhbFNpemUpLCBpbWFnZVBhaW50aW5nT3B0aW9ucyk7CisgICAgYXV0byBpbWFn ZUxvZ2ljYWxTaXplID0gaW1hZ2UtPmxvZ2ljYWxTaXplKCk7CisgICAgZHJhd0NvbnN1bWluZ0lt YWdlQnVmZmVyKFdURk1vdmUoaW1hZ2UpLCBGbG9hdFJlY3QoZGVzdGluYXRpb24sIGltYWdlTG9n aWNhbFNpemUpLCBGbG9hdFJlY3QoeyB9LCBpbWFnZUxvZ2ljYWxTaXplKSwgaW1hZ2VQYWludGlu Z09wdGlvbnMpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0NvbnN1bWluZ0ltYWdl QnVmZmVyKFJlZlB0cjxJbWFnZUJ1ZmZlcj4gaW1hZ2UsIGNvbnN0IEZsb2F0UmVjdCYgZGVzdGlu YXRpb24sIGNvbnN0IEltYWdlUGFpbnRpbmdPcHRpb25zJiBpbWFnZVBhaW50aW5nT3B0aW9ucykK IHsKICAgICBpZiAoIWltYWdlKQogICAgICAgICByZXR1cm47Ci0gICAgSW50U2l6ZSBpbWFnZUxv Z2ljYWxTaXplID0gaW1hZ2UtPnRydW5jYXRlZExvZ2ljYWxTaXplKCk7Ci0gICAgZHJhd0NvbnN1 bWluZ0ltYWdlQnVmZmVyKFdURk1vdmUoaW1hZ2UpLCBkZXN0aW5hdGlvbiwgRmxvYXRSZWN0KEZs b2F0UG9pbnQoKSwgRmxvYXRTaXplKGltYWdlTG9naWNhbFNpemUpKSwgaW1hZ2VQYWludGluZ09w dGlvbnMpOworICAgIGF1dG8gaW1hZ2VMb2dpY2FsU2l6ZSA9IGltYWdlLT5sb2dpY2FsU2l6ZSgp OworICAgIGRyYXdDb25zdW1pbmdJbWFnZUJ1ZmZlcihXVEZNb3ZlKGltYWdlKSwgZGVzdGluYXRp b24sIEZsb2F0UmVjdCh7IH0sIGltYWdlTG9naWNhbFNpemUpLCBpbWFnZVBhaW50aW5nT3B0aW9u cyk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Q29uc3VtaW5nSW1hZ2VCdWZmZXIo UmVmUHRyPEltYWdlQnVmZmVyPiBpbWFnZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0aW5hdGlvbiwg Y29uc3QgRmxvYXRSZWN0JiBzb3VyY2UsIGNvbnN0IEltYWdlUGFpbnRpbmdPcHRpb25zJiBvcHRp b25zKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxh eWxpc3RzL0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNwbGF5TGlzdEltYWdlQnVmZmVyLmgKaW5kZXggM2Rj YTk3Y2ZlYmMwNzczZDcwM2I2NTcyZTkzMzM1NWQ0YzMyNTgzMi4uN2VhMmExNGM3OGYzODVmYTdl ZmQ5OTY1YjllMmMyZDlkNTAwMjEwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlMaXN0SW1hZ2VCdWZmZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3RJ bWFnZUJ1ZmZlci5oCkBAIC01Miw3ICs1Miw3IEBAIHB1YmxpYzoKIAogICAgIEltYWdlQnVmZmVy KGNvbnN0IEltYWdlQnVmZmVyQmFja2VuZDo6UGFyYW1ldGVycyYgcGFyYW1ldGVycywgc3RkOjp1 bmlxdWVfcHRyPEJhY2tlbmRUeXBlPiYmIGJhY2tlbmQpCiAgICAgICAgIDogQmFzZUNvbmNyZXRl SW1hZ2VCdWZmZXIocGFyYW1ldGVycywgV1RGTW92ZShiYWNrZW5kKSkKLSAgICAgICAgLCBtX2Ry YXdpbmdDb250ZXh0KHRydW5jYXRlZExvZ2ljYWxTaXplKCksIGJhc2VUcmFuc2Zvcm0oKSkKKyAg ICAgICAgLCBtX2RyYXdpbmdDb250ZXh0KGxvZ2ljYWxTaXplKCksIGJhc2VUcmFuc2Zvcm0oKSkK ICAgICAgICAgLCBtX3dyaXRpbmdDbGllbnQobWFrZVVuaXF1ZTxJbk1lbW9yeURpc3BsYXlMaXN0 OjpXcml0aW5nQ2xpZW50PigpKQogICAgICAgICAsIG1fcmVhZGluZ0NsaWVudChtYWtlVW5pcXVl PEluTWVtb3J5RGlzcGxheUxpc3Q6OlJlYWRpbmdDbGllbnQ+KCkpCiAgICAgewpAQCAtNjIsNyAr NjIsNyBAQCBwdWJsaWM6CiAKICAgICBJbWFnZUJ1ZmZlcihjb25zdCBJbWFnZUJ1ZmZlckJhY2tl bmQ6OlBhcmFtZXRlcnMmIHBhcmFtZXRlcnMsIFJlY29yZGVySW1wbDo6RGVsZWdhdGUqIGRlbGVn YXRlID0gbnVsbHB0cikKICAgICAgICAgOiBCYXNlQ29uY3JldGVJbWFnZUJ1ZmZlcihwYXJhbWV0 ZXJzKQotICAgICAgICAsIG1fZHJhd2luZ0NvbnRleHQodHJ1bmNhdGVkTG9naWNhbFNpemUoKSwg YmFzZVRyYW5zZm9ybSgpLCBkZWxlZ2F0ZSkKKyAgICAgICAgLCBtX2RyYXdpbmdDb250ZXh0KGxv Z2ljYWxTaXplKCksIGJhc2VUcmFuc2Zvcm0oKSwgZGVsZWdhdGUpCiAgICAgICAgICwgbV93cml0 aW5nQ2xpZW50KG1ha2VVbmlxdWU8SW5NZW1vcnlEaXNwbGF5TGlzdDo6V3JpdGluZ0NsaWVudD4o KSkKICAgICAgICAgLCBtX3JlYWRpbmdDbGllbnQobWFrZVVuaXF1ZTxJbk1lbW9yeURpc3BsYXlM aXN0OjpSZWFkaW5nQ2xpZW50PigpKQogICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVCbGVuZC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFQmxlbmQuY3BwCmluZGV4IGNiODNhODYxMDMzMzM2 NGE1ODUwMGUxOTMwNmMzM2NiZjdiNmFiMTUuLjVhYzdmNDkwZDRjZGE1MzNhNDFmNWMzZDg1NDUz MmMxOGFkY2RiNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2ZpbHRlcnMvRkVCbGVuZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZmlsdGVycy9GRUJsZW5kLmNwcApAQCAtNzAsNyArNzAsNyBAQCB2b2lkIEZFQmxlbmQ6OnBs YXRmb3JtQXBwbHlTb2Z0d2FyZSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGZpbHRlckNvbnRl eHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1ZmZlcjIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1h Z2UoaW4yLT5hYnNvbHV0ZVBhaW50UmVjdCgpKSk7Ci0gICAgZmlsdGVyQ29udGV4dC5kcmF3SW1h Z2VCdWZmZXIoKmltYWdlQnVmZmVyLCBkcmF3aW5nUmVnaW9uT2ZJbnB1dEltYWdlKGluLT5hYnNv bHV0ZVBhaW50UmVjdCgpKSwgSW50UmVjdChJbnRQb2ludCgpLCBpbWFnZUJ1ZmZlci0+dHJ1bmNh dGVkTG9naWNhbFNpemUoKSksIHsgQ29tcG9zaXRlT3BlcmF0b3I6OlNvdXJjZU92ZXIsIG1fbW9k ZSB9KTsKKyAgICBmaWx0ZXJDb250ZXh0LmRyYXdJbWFnZUJ1ZmZlcigqaW1hZ2VCdWZmZXIsIGRy YXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4tPmFic29sdXRlUGFpbnRSZWN0KCkpLCB7IHsgfSwg aW1hZ2VCdWZmZXItPmxvZ2ljYWxTaXplKCkgfSwgeyBDb21wb3NpdGVPcGVyYXRvcjo6U291cmNl T3ZlciwgbV9tb2RlIH0pOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVDb21wb3NpdGUuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbXBvc2l0ZS5jcHAKaW5kZXggZjhhNjQ3 OTBjMWNiNDA5MGE5ZjYyYTkxZTQ1ZTFkYjUyM2Y5Y2I1ZS4uODMzNTMwOTA4MWEyNmJhMmMzMWMz YmRhYzg4ODY2OWUyOGUzNDU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZmlsdGVycy9GRUNvbXBvc2l0ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUNvbXBvc2l0ZS5jcHAKQEAgLTI3OCwxOSArMjc4LDE5 IEBAIHZvaWQgRkVDb21wb3NpdGU6OnBsYXRmb3JtQXBwbHlTb2Z0d2FyZSgpCiAgICAgfQogICAg IGNhc2UgRkVDT01QT1NJVEVfT1BFUkFUT1JfT1VUOgogICAgICAgICBmaWx0ZXJDb250ZXh0LmRy YXdJbWFnZUJ1ZmZlcigqaW1hZ2VCdWZmZXIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4t PmFic29sdXRlUGFpbnRSZWN0KCkpKTsKLSAgICAgICAgZmlsdGVyQ29udGV4dC5kcmF3SW1hZ2VC dWZmZXIoKmltYWdlQnVmZmVyMiwgZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbjItPmFic29s dXRlUGFpbnRSZWN0KCkpLCBJbnRSZWN0KEludFBvaW50KCksIGltYWdlQnVmZmVyMi0+dHJ1bmNh dGVkTG9naWNhbFNpemUoKSksIENvbXBvc2l0ZU9wZXJhdG9yOjpEZXN0aW5hdGlvbk91dCk7Cisg ICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1ZmZlcjIsIGRyYXdp bmdSZWdpb25PZklucHV0SW1hZ2UoaW4yLT5hYnNvbHV0ZVBhaW50UmVjdCgpKSwgeyB7IH0sIGlt YWdlQnVmZmVyMi0+bG9naWNhbFNpemUoKSB9LCBDb21wb3NpdGVPcGVyYXRvcjo6RGVzdGluYXRp b25PdXQpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIEZFQ09NUE9TSVRFX09QRVJBVE9SX0FU T1A6CiAgICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1ZmZlcjIs IGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4yLT5hYnNvbHV0ZVBhaW50UmVjdCgpKSk7Ci0g ICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVmZmVyKCppbWFnZUJ1ZmZlciwgZHJhd2lu Z1JlZ2lvbk9mSW5wdXRJbWFnZShpbi0+YWJzb2x1dGVQYWludFJlY3QoKSksIEludFJlY3QoSW50 UG9pbnQoKSwgaW1hZ2VCdWZmZXItPnRydW5jYXRlZExvZ2ljYWxTaXplKCkpLCBDb21wb3NpdGVP cGVyYXRvcjo6U291cmNlQXRvcCk7CisgICAgICAgIGZpbHRlckNvbnRleHQuZHJhd0ltYWdlQnVm ZmVyKCppbWFnZUJ1ZmZlciwgZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbi0+YWJzb2x1dGVQ YWludFJlY3QoKSksIHsgeyB9LCBpbWFnZUJ1ZmZlci0+bG9naWNhbFNpemUoKSB9LCBDb21wb3Np dGVPcGVyYXRvcjo6U291cmNlQXRvcCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRkVDT01Q T1NJVEVfT1BFUkFUT1JfWE9SOgogICAgICAgICBmaWx0ZXJDb250ZXh0LmRyYXdJbWFnZUJ1ZmZl cigqaW1hZ2VCdWZmZXIyLCBkcmF3aW5nUmVnaW9uT2ZJbnB1dEltYWdlKGluMi0+YWJzb2x1dGVQ YWludFJlY3QoKSkpOwotICAgICAgICBmaWx0ZXJDb250ZXh0LmRyYXdJbWFnZUJ1ZmZlcigqaW1h Z2VCdWZmZXIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4tPmFic29sdXRlUGFpbnRSZWN0 KCkpLCBJbnRSZWN0KEludFBvaW50KCksIGltYWdlQnVmZmVyLT50cnVuY2F0ZWRMb2dpY2FsU2l6 ZSgpKSwgQ29tcG9zaXRlT3BlcmF0b3I6OlhPUik7CisgICAgICAgIGZpbHRlckNvbnRleHQuZHJh d0ltYWdlQnVmZmVyKCppbWFnZUJ1ZmZlciwgZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbi0+ YWJzb2x1dGVQYWludFJlY3QoKSksIHsgeyB9LCBpbWFnZUJ1ZmZlci0+bG9naWNhbFNpemUoKSB9 LCBDb21wb3NpdGVPcGVyYXRvcjo6WE9SKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBGRUNP TVBPU0lURV9PUEVSQVRPUl9MSUdIVEVSOgogICAgICAgICBmaWx0ZXJDb250ZXh0LmRyYXdJbWFn ZUJ1ZmZlcigqaW1hZ2VCdWZmZXIyLCBkcmF3aW5nUmVnaW9uT2ZJbnB1dEltYWdlKGluMi0+YWJz b2x1dGVQYWludFJlY3QoKSkpOwotICAgICAgICBmaWx0ZXJDb250ZXh0LmRyYXdJbWFnZUJ1ZmZl cigqaW1hZ2VCdWZmZXIsIGRyYXdpbmdSZWdpb25PZklucHV0SW1hZ2UoaW4tPmFic29sdXRlUGFp bnRSZWN0KCkpLCBJbnRSZWN0KEludFBvaW50KCksIGltYWdlQnVmZmVyLT50cnVuY2F0ZWRMb2dp Y2FsU2l6ZSgpKSwgQ29tcG9zaXRlT3BlcmF0b3I6OlBsdXNMaWdodGVyKTsKKyAgICAgICAgZmls dGVyQ29udGV4dC5kcmF3SW1hZ2VCdWZmZXIoKmltYWdlQnVmZmVyLCBkcmF3aW5nUmVnaW9uT2ZJ bnB1dEltYWdlKGluLT5hYnNvbHV0ZVBhaW50UmVjdCgpKSwgeyB7IH0sIGltYWdlQnVmZmVyLT5s b2dpY2FsU2l6ZSgpIH0sIENvbXBvc2l0ZU9wZXJhdG9yOjpQbHVzTGlnaHRlcik7CiAgICAgICAg IGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0NTU0ZpbHRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvQ1NTRmlsdGVyLmNwcAppbmRleCBiMjViMTkzYTEwY2RlZTYzMTU5YjAyMzRhMjJlODVjNjJm ZTg1ZDQyLi45ZDZjMmNkZDA1Zjk0OWI2MzRjYWZhMTdhYzE3ZGI1YzAyYjViNjExIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvQ1NTRmlsdGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvQ1NTRmlsdGVyLmNwcApAQCAtMzMxLDggKzMzMSw4IEBAIHZvaWQg Q1NTRmlsdGVyOjphbGxvY2F0ZUJhY2tpbmdTdG9yZUlmTmVlZGVkKGNvbnN0IEdyYXBoaWNzQ29u dGV4dCYgdGFyZ2V0Q29udGV4CiAgICAgaWYgKG1fZ3JhcGhpY3NCdWZmZXJBdHRhY2hlZCkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgSW50U2l6ZSBsb2dpY2FsU2l6ZSB7IG1fc291cmNlRHJhd2lu Z1JlZ2lvbi5zaXplKCkgfTsKLSAgICBpZiAoIXNvdXJjZUltYWdlKCkgfHwgc291cmNlSW1hZ2Uo KS0+dHJ1bmNhdGVkTG9naWNhbFNpemUoKSAhPSBsb2dpY2FsU2l6ZSkgeworICAgIGF1dG8gbG9n aWNhbFNpemUgPSBtX3NvdXJjZURyYXdpbmdSZWdpb24uc2l6ZSgpOworICAgIGlmICghc291cmNl SW1hZ2UoKSB8fCBzb3VyY2VJbWFnZSgpLT5sb2dpY2FsU2l6ZSgpICE9IGxvZ2ljYWxTaXplKSB7 CiAjaWYgVVNFKERJUkVDVDJEKQogICAgICAgICBzZXRTb3VyY2VJbWFnZShJbWFnZUJ1ZmZlcjo6 Y3JlYXRlKGxvZ2ljYWxTaXplLCByZW5kZXJpbmdNb2RlKCksICZ0YXJnZXRDb250ZXh0LCBmaWx0 ZXJTY2FsZSgpLCBEZXN0aW5hdGlvbkNvbG9yU3BhY2U6OlNSR0IoKSwgUGl4ZWxGb3JtYXQ6OkJH UkE4KSk7CiAjZWxzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2Zy9S ZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3N2 Zy9SZW5kZXJTVkdSZXNvdXJjZVBhdHRlcm4uY3BwCmluZGV4IGQ5ZjY5MWQxZjkzMTY3ZWJiOTUw MDI2NWFhNjYwZGUxM2RkN2I5ZmIuLjJjNjA1NTkwZGI0MDNlZjQ0YmYxNzhiYzA3Yzg0MTYwNDlj MDk1MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvUmVuZGVyU1ZH UmVzb3VyY2VQYXR0ZXJuLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1Jl bmRlclNWR1Jlc291cmNlUGF0dGVybi5jcHAKQEAgLTExMSw3ICsxMTEsNyBAQCBQYXR0ZXJuRGF0 YSogUmVuZGVyU1ZHUmVzb3VyY2VQYXR0ZXJuOjpidWlsZFBhdHRlcm4oUmVuZGVyRWxlbWVudCYg cmVuZGVyZXIsIE9wdAogICAgIGlmICghdGlsZUltYWdlKQogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAotICAgIGNvbnN0IEludFNpemUgdGlsZUltYWdlU2l6ZSA9IHRpbGVJbWFnZS0+dHJ1bmNh dGVkTG9naWNhbFNpemUoKTsKKyAgICBhdXRvIHRpbGVJbWFnZVNpemUgPSB0aWxlSW1hZ2UtPmxv Z2ljYWxTaXplKCk7CiAKICAgICBhdXRvIGNvcGllZEltYWdlID0gSW1hZ2VCdWZmZXI6OnNpbmtJ bnRvTmF0aXZlSW1hZ2UoV1RGTW92ZSh0aWxlSW1hZ2UpKTsKICAgICBpZiAoIWNvcGllZEltYWdl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1v dGVJbWFnZUJ1ZmZlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAppbmRleCBjOGIwMzQ5ZmU2YzY3YzRmNzkxYWJk ZjQxYmE2NzIyNDk4N2M2NWVkLi4xYzIxNWZlZWFhNWRhMWUwZWM0YTIxM2RkOGEzNDY2ZGRjYmQ1 M2Q4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1Jl bW90ZUltYWdlQnVmZmVyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BV L2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaApAQCAtMTAyLDcgKzEwMiw3IEBAIHBy b3RlY3RlZDoKICAgICBSZW1vdGVJbWFnZUJ1ZmZlclByb3h5KGNvbnN0IFdlYkNvcmU6OkltYWdl QnVmZmVyQmFja2VuZDo6UGFyYW1ldGVycyYgcGFyYW1ldGVycywgUmVtb3RlUmVuZGVyaW5nQmFj a2VuZFByb3h5JiByZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkpCiAgICAgICAgIDogQmFzZUNv bmNyZXRlSW1hZ2VCdWZmZXIocGFyYW1ldGVycykKICAgICAgICAgLCBtX3JlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eShyZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkpCi0gICAgICAgICwgbV9y ZW1vdGVEaXNwbGF5TGlzdCgqdGhpcywgcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LCB7IHsg fSwgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXI6OnRydW5jYXRlZExvZ2ljYWxTaXplKCkgfSwgQmFz ZUNvbmNyZXRlSW1hZ2VCdWZmZXI6OmJhc2VUcmFuc2Zvcm0oKSkKKyAgICAgICAgLCBtX3JlbW90 ZURpc3BsYXlMaXN0KCp0aGlzLCByZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHksIHsgeyB9LCBC YXNlQ29uY3JldGVJbWFnZUJ1ZmZlcjo6bG9naWNhbFNpemUoKSB9LCBCYXNlQ29uY3JldGVJbWFn ZUJ1ZmZlcjo6YmFzZVRyYW5zZm9ybSgpKQogICAgIHsKICAgICAgICAgQVNTRVJUKG1fcmVtb3Rl UmVuZGVyaW5nQmFja2VuZFByb3h5KTsKICAgICAgICAgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHktPnJlbW90ZVJlc291cmNlQ2FjaGVQcm94eSgpLmNhY2hlSW1hZ2VCdWZmZXIoKnRoaXMp Owo=