65926 2011-08-09 10:08:45 -0700 ResourceLoader::didReceiveDataArray() does not handle m_shouldBufferData correctly 2011-08-12 13:35:58 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 61863 1 psolanki psolanki ap jberlin psolanki oldest_to_newest 448641 0 psolanki 2011-08-09 10:08:45 -0700 This was noticed in <https://bugs.webkit.org/show_bug.cgi?id=61863#c11> by Alexey. ResourceLoader::didReceiveDataArray() does an early bailout if m_shouldBufferData is set to false. It does not call through to the client and pass the data like didReceiveData() does. 449271 1 103510 psolanki 2011-08-10 11:44:55 -0700 Created attachment 103510 Patch 450291 2 psolanki 2011-08-11 22:19:14 -0700 I was going to check this in and then I realized that the current code was avoiding copies by calling SharedBuffer::append(CFDataRef). If I change it to call addData() then we end up calling SharedBuffer::append(const char*, int) which would end up copying the char* buffer passed in. I am going to rework this so I can continue to call the SharedBuffer::append(CFDataRef). 450327 3 103745 psolanki 2011-08-12 00:00:58 -0700 Created attachment 103745 Patch 450337 4 103745 ap 2011-08-12 00:38:24 -0700 Comment on attachment 103745 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103745&action=review > Source/WebCore/loader/mac/ResourceLoaderMac.mm:80 > if (!m_resourceData) > m_resourceData = SharedBuffer::create(); I don't think that we are supposed to create m_resourceData unless we're buffering. 450440 5 103775 psolanki 2011-08-12 08:36:20 -0700 Created attachment 103775 Patch 450450 6 103775 ap 2011-08-12 09:08:24 -0700 Comment on attachment 103775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103775&action=review This patch looks fine, but I had a look at SharedBuffer code, and that doesn't look correct to me. 1. SharedBuffer(CFDataRef) doesn't set m_size, which may or may not be by design, but is extremely confusing. If this m_size data member only counts sizes of some data representations, the variable should be called appropriately. And then SharedBuffer::append(CFDataRef) increments m_size?! 2. SharedBuffer::maybeTransferPlatformData() doesn't set m_size after copying in CFData. 3. SharedBuffer::clearPlatformData() doesn't clear m_size. 4. SharedBuffer::platformDataSize() only looks at the first chunk, and never at m_dataArray. 5. SharedBuffer::maybeTransferPlatformData() doesn't transfer m_dataArray. > Source/WebCore/loader/mac/ResourceLoaderMac.mm:87 > + if (!m_resourceData) > + m_resourceData = SharedBuffer::create(); > + m_resourceData->append(data); You could also copy how it's done in addData(): if (!m_resourceData) m_resourceData = SharedBuffer::create(data); else m_resourceData->append(data); 450583 7 psolanki 2011-08-12 12:51:39 -0700 (In reply to comment #6) > (From update of attachment 103775 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103775&action=review > > This patch looks fine, but I had a look at SharedBuffer code, and that doesn't look correct to me. I think the confusions stem from the fact that SharedBuffer takes on different roles in different scenarios. In one of the reviews, David Kilzer had suggested we refactor SharedBuffer but I don't think I filed bug for it. The data array part of SharedBuffer is different from the CFDataRef part. The latter is used when you create a SharedBuffer that is a wrapper around a single CFDataRef, whereas the data array part behaves more like the version that takes char* buffers. > 1. SharedBuffer(CFDataRef) doesn't set m_size, which may or may not be by design, but is extremely confusing. If this m_size data member only counts sizes of some data representations, the variable should be called appropriately. And then SharedBuffer::append(CFDataRef) increments m_size?! I do not expect SharedBuffer::append(CFDataRef) to be called on a SharedBuffer constructed via SharedBuffer(CFDataRef). But yeah, if that were to happen things won't work correctly. We have 2 fields in SharedBuffer 1. CFDataRef m_cfData - This is the "platform data" 2. Vector<RetainPtr<CFDataRef> > m_dataArray - This is the data array. > 2. SharedBuffer::maybeTransferPlatformData() doesn't set m_size after copying in CFData. I think it should for correctness. Doesn't look like append() will work correctly. It probably works right now because we don't call append(const char*, int) on a SharedBuffer that was created with a CFDataRef (i.e. via wrapCFData()). > 3. SharedBuffer::clearPlatformData() doesn't clear m_size. But that seems to be only called from SharedBuffer::clear() which sets m_size to 0. > 4. SharedBuffer::platformDataSize() only looks at the first chunk, and never at m_dataArray. Right. the platformData functions only look at the CFDataRef. > 5. SharedBuffer::maybeTransferPlatformData() doesn't transfer m_dataArray. Yeah, it probably should. > > Source/WebCore/loader/mac/ResourceLoaderMac.mm:87 > > + if (!m_resourceData) > > + m_resourceData = SharedBuffer::create(); > > + m_resourceData->append(data); > > You could also copy how it's done in addData(): > > if (!m_resourceData) > m_resourceData = SharedBuffer::create(data); > else > m_resourceData->append(data); I'll keep it the way I have it since, the CFDataRef constructor won't work with CFDataArrayRef code. I think SharedBuffer class is calling for a cleanup! 450619 8 psolanki 2011-08-12 13:33:25 -0700 Committed r92985: <http://trac.webkit.org/changeset/92985> 450622 9 ap 2011-08-12 13:35:58 -0700 > Right. the platformData functions only look at the CFDataRef. This means that SharedBuffer::size() will always return a wrong size when m_dataArray is non-empty. Even though the code has been tested in practice, I'm not convinced that it actually always works without losing parts of response data today. 103510 2011-08-10 11:44:55 -0700 2011-08-11 22:22:19 -0700 Patch bug-65926-20110810114454.patch text/plain 2468 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogOTI3NzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjMDEwZmE5NWEyOGVkNTVi ODgyZjI2YzM5YTEwOGVjMjk1ODFjNjA3Li5jNWM4OTQxZjQ4ZmYwZDNlMTc1ZjU5OTNlZDMxNWEz OTc3ZDQ4ZjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMTAgIFByYXRp ayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTkyNgorICAgICAgICBSZXNvdXJjZUxvYWRlcjo6 ZGlkUmVjZWl2ZURhdGFBcnJheSgpIGRvZXMgbm90IGhhbmRsZSBtX3Nob3VsZEJ1ZmZlckRhdGEg Y29ycmVjdGx5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBsb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVEYXRhQXJyYXkpOiBNYWtlIHN1cmUgd2UgY2FsbCB0 aGUgY2xpZW50IGNhbGxiYWNrcyB3aGVuCisgICAgICAgIG1fc2hvdWxkQnVmZmVyRGF0YSBpcyBz ZXQgdG8gZmFsc2UuCisKIDIwMTEtMDgtMTAgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogY29uc29sZSBtZXNzYWdlcyBtYXJr ZXJzIGFyZSBsb3N0IGluIFJlc291cmNlcyBwYW5lbCBhZnRlciBwYWdlIHJlbG9hZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL21hYy9SZXNvdXJjZUxvYWRlck1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9tYWMvUmVzb3VyY2VMb2FkZXJNYWMubW0KaW5kZXggMzJmM2Jm NDIzOTVlYmZmYmQwMzcwMzIwYzA4YTRhOGFjYzg2ZTQ0My4uZWEzZDBjMzVjZDExOTZjYThhMjQ1 MDU1ZTc5MGE3YzBkMDY3OTY1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL21h Yy9SZXNvdXJjZUxvYWRlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvbWFjL1Jl c291cmNlTG9hZGVyTWFjLm1tCkBAIC03NiwyNCArNzYsMTkgQEAgdm9pZCBSZXNvdXJjZUxvYWRl cjo6ZGlkUmVjZWl2ZURhdGFBcnJheShDRkFycmF5UmVmIGRhdGFBcnJheSkKICAgICAvLyBhbnl0 aGluZyBpbmNsdWRpbmcgcG9zc2libHkgZGVyZWZpbmcgdGhpczsgb25lIGV4YW1wbGUgb2YgdGhp cyBpcyBSYWRhciAzMjY2MjE2LgogICAgIFJlZlB0cjxSZXNvdXJjZUxvYWRlcj4gcHJvdGVjdG9y KHRoaXMpOwogCi0gICAgaWYgKCFtX3Nob3VsZEJ1ZmZlckRhdGEpCi0gICAgICAgIHJldHVybjsK LQotICAgIGlmICghbV9yZXNvdXJjZURhdGEpCi0gICAgICAgIG1fcmVzb3VyY2VEYXRhID0gU2hh cmVkQnVmZmVyOjpjcmVhdGUoKTsKLQogICAgIENGSW5kZXggYXJyYXlDb3VudCA9IENGQXJyYXlH ZXRDb3VudChkYXRhQXJyYXkpOwogICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IGFycmF5Q291 bnQ7ICsraSkgewogICAgICAgICBDRkRhdGFSZWYgZGF0YSA9IHN0YXRpY19jYXN0PENGRGF0YVJl Zj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChkYXRhQXJyYXksIGkpKTsKICAgICAgICAgaW50IGRh dGFMZW4gPSBzdGF0aWNfY2FzdDxpbnQ+KENGRGF0YUdldExlbmd0aChkYXRhKSk7CisgICAgICAg IGNvbnN0IGNoYXIqIGJ5dGVzID0gcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oQ0ZEYXRh R2V0Qnl0ZVB0cihkYXRhKSk7CiAKLSAgICAgICAgbV9yZXNvdXJjZURhdGEtPmFwcGVuZChkYXRh KTsKKyAgICAgICAgYWRkRGF0YShieXRlcywgZGF0YUxlbiwgZmFsc2UpOwogCiAgICAgICAgIC8v IEZJWE1FOiBJZiB3ZSBnZXQgYSByZXNvdXJjZSB3aXRoIG1vcmUgdGhhbiAyQiBieXRlcywgdGhp cyBjb2RlIHdvbid0IGRvIHRoZSByaWdodCB0aGluZy4KICAgICAgICAgLy8gSG93ZXZlciwgd2l0 aCB0b2RheSdzIGNvbXB1dGVycyBhbmQgbmV0d29ya2luZyBzcGVlZHMsIHRoaXMgd29uJ3QgaGFw cGVuIGluIHByYWN0aWNlLgogICAgICAgICAvLyBDb3VsZCBiZSBhbiBpc3N1ZSB3aXRoIGEgZ2lh bnQgbG9jYWwgZmlsZS4KICAgICAgICAgaWYgKG1fc2VuZFJlc291cmNlTG9hZENhbGxiYWNrcyAm JiBtX2ZyYW1lKQotICAgICAgICAgICAgZnJhbWVMb2FkZXIoKS0+bm90aWZpZXIoKS0+ZGlkUmVj ZWl2ZURhdGEodGhpcywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4oQ0ZEYXRhR2V0Qnl0 ZVB0cihkYXRhKSksIGRhdGFMZW4sIGRhdGFMZW4pOworICAgICAgICAgICAgZnJhbWVMb2FkZXIo KS0+bm90aWZpZXIoKS0+ZGlkUmVjZWl2ZURhdGEodGhpcywgYnl0ZXMsIGRhdGFMZW4sIGRhdGFM ZW4pOwogICAgIH0KIH0KIAo= 103745 2011-08-12 00:00:58 -0700 2011-08-12 08:36:16 -0700 Patch bug-65926-20110812000056.patch text/plain 2012 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5MTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3Yjc1YTQ2MTM1ZmIyNzg5 MTI1MjUxOTk5MWI2ZWY5ZTFjYjNkYWJmLi44OGRjNzM5ZWFlYTQ1ZTI4ZjFkNTA2Y2VlMzQ5YmFi YmVjMmQ5OWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMTEgIFByYXRp ayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlTG9hZGVy OjpkaWRSZWNlaXZlRGF0YUFycmF5KCkgZG9lcyBub3QgaGFuZGxlIG1fc2hvdWxkQnVmZmVyRGF0 YSBjb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY1OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBsb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVEYXRhQXJyYXkpOiBNYWtlIHN1cmUgd2UgY2FsbCB0 aGUgY2xpZW50IGNhbGxiYWNrcyB3aGVuCisgICAgICAgIG1fc2hvdWxkQnVmZmVyRGF0YSBpcyBz ZXQgdG8gZmFsc2UuCisKIDIwMTEtMDgtMTEgIEpvaG4gQmF1bWFuICA8amJhdW1hbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmVhZGJhY2sgY29tcG9zaXRlZCB3ZWJnbCByZXN1bHRzIGZvciBw cmludGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL21hYy9SZXNvdXJjZUxv YWRlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9tYWMvUmVzb3VyY2VMb2FkZXJNYWMu bW0KaW5kZXggMzJmM2JmNDIzOTVlYmZmYmQwMzcwMzIwYzA4YTRhOGFjYzg2ZTQ0My4uMjNkNzA0 NTJmMTY1MjJiMWNhNzRlM2ZhYWQxZjFhM2NmMDAzYmNhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL21hYy9SZXNvdXJjZUxvYWRlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tCkBAIC03Niw5ICs3Niw2IEBAIHZvaWQg UmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVEYXRhQXJyYXkoQ0ZBcnJheVJlZiBkYXRhQXJyYXkp CiAgICAgLy8gYW55dGhpbmcgaW5jbHVkaW5nIHBvc3NpYmx5IGRlcmVmaW5nIHRoaXM7IG9uZSBl eGFtcGxlIG9mIHRoaXMgaXMgUmFkYXIgMzI2NjIxNi4KICAgICBSZWZQdHI8UmVzb3VyY2VMb2Fk ZXI+IHByb3RlY3Rvcih0aGlzKTsKIAotICAgIGlmICghbV9zaG91bGRCdWZmZXJEYXRhKQotICAg ICAgICByZXR1cm47Ci0KICAgICBpZiAoIW1fcmVzb3VyY2VEYXRhKQogICAgICAgICBtX3Jlc291 cmNlRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKCk7CiAKQEAgLTg3LDcgKzg0LDggQEAgdm9p ZCBSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGFBcnJheShDRkFycmF5UmVmIGRhdGFBcnJh eSkKICAgICAgICAgQ0ZEYXRhUmVmIGRhdGEgPSBzdGF0aWNfY2FzdDxDRkRhdGFSZWY+KENGQXJy YXlHZXRWYWx1ZUF0SW5kZXgoZGF0YUFycmF5LCBpKSk7CiAgICAgICAgIGludCBkYXRhTGVuID0g c3RhdGljX2Nhc3Q8aW50PihDRkRhdGFHZXRMZW5ndGgoZGF0YSkpOwogCi0gICAgICAgIG1fcmVz b3VyY2VEYXRhLT5hcHBlbmQoZGF0YSk7CisgICAgICAgIGlmIChtX3Nob3VsZEJ1ZmZlckRhdGEp CisgICAgICAgICAgICBtX3Jlc291cmNlRGF0YS0+YXBwZW5kKGRhdGEpOwogCiAgICAgICAgIC8v IEZJWE1FOiBJZiB3ZSBnZXQgYSByZXNvdXJjZSB3aXRoIG1vcmUgdGhhbiAyQiBieXRlcywgdGhp cyBjb2RlIHdvbid0IGRvIHRoZSByaWdodCB0aGluZy4KICAgICAgICAgLy8gSG93ZXZlciwgd2l0 aCB0b2RheSdzIGNvbXB1dGVycyBhbmQgbmV0d29ya2luZyBzcGVlZHMsIHRoaXMgd29uJ3QgaGFw cGVuIGluIHByYWN0aWNlLgo= 103775 2011-08-12 08:36:20 -0700 2011-08-12 09:08:24 -0700 Patch bug-65926-20110812083622.patch text/plain 2140 psolanki U3VidmVyc2lvbiBSZXZpc2lvbjogOTI5MTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3Yjc1YTQ2MTM1ZmIyNzg5 MTI1MjUxOTk5MWI2ZWY5ZTFjYjNkYWJmLi44OGRjNzM5ZWFlYTQ1ZTI4ZjFkNTA2Y2VlMzQ5YmFi YmVjMmQ5OWY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDgtMTEgIFByYXRp ayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUuY29tPgorCisgICAgICAgIFJlc291cmNlTG9hZGVy OjpkaWRSZWNlaXZlRGF0YUFycmF5KCkgZG9lcyBub3QgaGFuZGxlIG1fc2hvdWxkQnVmZmVyRGF0 YSBjb3JyZWN0bHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY1OTI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBsb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVEYXRhQXJyYXkpOiBNYWtlIHN1cmUgd2UgY2FsbCB0 aGUgY2xpZW50IGNhbGxiYWNrcyB3aGVuCisgICAgICAgIG1fc2hvdWxkQnVmZmVyRGF0YSBpcyBz ZXQgdG8gZmFsc2UuCisKIDIwMTEtMDgtMTEgIEpvaG4gQmF1bWFuICA8amJhdW1hbkBjaHJvbWl1 bS5vcmc+CiAKICAgICAgICAgUmVhZGJhY2sgY29tcG9zaXRlZCB3ZWJnbCByZXN1bHRzIGZvciBw cmludGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL21hYy9SZXNvdXJjZUxv YWRlck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9tYWMvUmVzb3VyY2VMb2FkZXJNYWMu bW0KaW5kZXggMzJmM2JmNDIzOTVlYmZmYmQwMzcwMzIwYzA4YTRhOGFjYzg2ZTQ0My4uZWQ0YjVh MThlZjM2M2Y4NjEwZWY5NTM2ODFhNTAwNjhkNjJiM2RkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL21hYy9SZXNvdXJjZUxvYWRlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvbWFjL1Jlc291cmNlTG9hZGVyTWFjLm1tCkBAIC03NiwxOCArNzYsMTYgQEAgdm9p ZCBSZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZURhdGFBcnJheShDRkFycmF5UmVmIGRhdGFBcnJh eSkKICAgICAvLyBhbnl0aGluZyBpbmNsdWRpbmcgcG9zc2libHkgZGVyZWZpbmcgdGhpczsgb25l IGV4YW1wbGUgb2YgdGhpcyBpcyBSYWRhciAzMjY2MjE2LgogICAgIFJlZlB0cjxSZXNvdXJjZUxv YWRlcj4gcHJvdGVjdG9yKHRoaXMpOwogCi0gICAgaWYgKCFtX3Nob3VsZEJ1ZmZlckRhdGEpCi0g ICAgICAgIHJldHVybjsKLQotICAgIGlmICghbV9yZXNvdXJjZURhdGEpCi0gICAgICAgIG1fcmVz b3VyY2VEYXRhID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUoKTsKLQogICAgIENGSW5kZXggYXJyYXlD b3VudCA9IENGQXJyYXlHZXRDb3VudChkYXRhQXJyYXkpOwogICAgIGZvciAoQ0ZJbmRleCBpID0g MDsgaSA8IGFycmF5Q291bnQ7ICsraSkgewogICAgICAgICBDRkRhdGFSZWYgZGF0YSA9IHN0YXRp Y19jYXN0PENGRGF0YVJlZj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChkYXRhQXJyYXksIGkpKTsK ICAgICAgICAgaW50IGRhdGFMZW4gPSBzdGF0aWNfY2FzdDxpbnQ+KENGRGF0YUdldExlbmd0aChk YXRhKSk7CiAKLSAgICAgICAgbV9yZXNvdXJjZURhdGEtPmFwcGVuZChkYXRhKTsKKyAgICAgICAg aWYgKG1fc2hvdWxkQnVmZmVyRGF0YSkgeworICAgICAgICAgICAgaWYgKCFtX3Jlc291cmNlRGF0 YSkKKyAgICAgICAgICAgICAgICBtX3Jlc291cmNlRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRl KCk7CisgICAgICAgICAgICBtX3Jlc291cmNlRGF0YS0+YXBwZW5kKGRhdGEpOworICAgICAgICB9 CiAKICAgICAgICAgLy8gRklYTUU6IElmIHdlIGdldCBhIHJlc291cmNlIHdpdGggbW9yZSB0aGFu IDJCIGJ5dGVzLCB0aGlzIGNvZGUgd29uJ3QgZG8gdGhlIHJpZ2h0IHRoaW5nLgogICAgICAgICAv LyBIb3dldmVyLCB3aXRoIHRvZGF5J3MgY29tcHV0ZXJzIGFuZCBuZXR3b3JraW5nIHNwZWVkcywg dGhpcyB3b24ndCBoYXBwZW4gaW4gcHJhY3RpY2UuCg==