44962 2010-08-31 10:18:01 -0700 deduplicate code from Node::checkReplaceChild and Node::checkAddChild 2010-08-31 11:22:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan ojan abarth darin eric tony oldest_to_newest 272173 0 ojan 2010-08-31 10:18:01 -0700 deduplicate code from Node::checkReplaceChild and Node::checkAddChild 272176 1 66068 ojan 2010-08-31 10:20:12 -0700 Created attachment 66068 Patch 272188 2 66068 eric 2010-08-31 10:29:36 -0700 Comment on attachment 66068 Patch > WebCore/dom/Node.cpp:1076 > + if (child->nodeType() != parent->DOCUMENT_FRAGMENT_NODE) { parent-> isn't needed here. I would have made the fragment case an early return instead. It's really hard to tell what this diff is doing. I know it's small, but maybe it could be smallr? 272190 3 ojan 2010-08-31 10:31:55 -0700 (In reply to comment #2) > (From update of attachment 66068 [details]) > > WebCore/dom/Node.cpp:1076 > > + if (child->nodeType() != parent->DOCUMENT_FRAGMENT_NODE) { > parent-> isn't needed here. > > I would have made the fragment case an early return instead. I was just copy-pasting the code. But I agree. I'll make it an early return. > It's really hard to tell what this diff is doing. I know it's small, but maybe it could be smallr? Meh. This is really a small change. We just really need side-by-side diffs. 272192 4 66069 ojan 2010-08-31 10:33:57 -0700 Created attachment 66069 Patch 272194 5 ojan 2010-08-31 10:36:28 -0700 As a side-by-side diff: http://codereview.appspot.com/2046045/ 272202 6 66069 tony 2010-08-31 10:43:08 -0700 Comment on attachment 66069 Patch > diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp > -bool Node::canReplaceChild(Node* newChild, Node*) > +static bool isChildTypeAllowed(Node* parent, Node* child) Nit: Perhaps newParent or newChild to make it clear that child->parent() != parent? The side by side diff was much easier to read. 272203 7 eric 2010-08-31 10:43:38 -0700 That link only helps a little. this si still *ridiculously* confusing. :( The names are all getting changed around. They were similar to begin with, so that didn't help. 272205 8 66069 eric 2010-08-31 10:44:54 -0700 Comment on attachment 66069 Patch > WebCore/dom/Node.cpp:1076 > + if (child->nodeType() != parent->DOCUMENT_FRAGMENT_NODE) { You still don't need parent-> here. 272210 9 ojan 2010-08-31 10:48:36 -0700 (In reply to comment #8) > (From update of attachment 66069 [details]) > > WebCore/dom/Node.cpp:1076 > > + if (child->nodeType() != parent->DOCUMENT_FRAGMENT_NODE) { > You still don't need parent-> here. Really? It didn't compile without it. 272214 10 eric 2010-08-31 10:54:28 -0700 (In reply to comment #9) > (In reply to comment #8) > > (From update of attachment 66069 [details] [details]) > > > WebCore/dom/Node.cpp:1076 > > > + if (child->nodeType() != parent->DOCUMENT_FRAGMENT_NODE) { > > You still don't need parent-> here. > > Really? It didn't compile without it. Yes, but it's an enum. You can use Node:: OK. I've read through the diff again. I believe Ojan has correctly moved code/not-changed-behavior now. 272218 11 ojan 2010-08-31 11:03:51 -0700 > Yes, but it's an enum. You can use Node:: Oh, duh. Will do. 272226 12 ojan 2010-08-31 11:22:39 -0700 Committed r66511: <http://trac.webkit.org/changeset/66511> 66068 2010-08-31 10:20:12 -0700 2010-08-31 10:33:54 -0700 Patch bug-44962-20100831102010.patch text/plain 7944 ojan ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzlkMWUyYTZlZWYxOTcyMTc2NDk2YmM3NTA5OTgzZTQ0ZGI5NGUzNC4uODcxMmVjNWZhOTlmZmNl MzQwMmViNjk0MDE2YzZlODZjZmMxNTM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wOC0zMSAgT2ph biBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGRlZHVwbGljYXRlIGNvZGUgZnJvbSBOb2RlOjpjaGVja1Jl cGxhY2VDaGlsZCBhbmQgTm9kZTo6Y2hlY2tBZGRDaGlsZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ5NjIKKworICAgICAgICBSZW1vdmUgZHVwbGlj YXRlIGNvZGUgaW4gcHJlcGFyYXRpb24gZm9yIGZpeGluZyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MjQKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoZXJl IGlzIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogZG9tL05vZGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6aXNDaGlsZFR5cGVBbGxvd2VkKToKKyAgICAgICAgKFdlYkNv cmU6Ok5vZGU6OmNhblJlcGxhY2VDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpjaGVja0FjY2Vw dENoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OnRyYW5zZmVyT3duZXJEb2N1bWVudCk6CisgICAg ICAgIChXZWJDb3JlOjpOb2RlOjpjaGVja1JlcGxhY2VDaGlsZCk6CisgICAgICAgIChXZWJDb3Jl OjpOb2RlOjpjaGVja0FkZENoaWxkKToKKwogMjAxMC0wOC0zMCAgQWxlamFuZHJvIEcuIENhc3Ry byAgPGFsZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5z b24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1dlYkNvcmUvZG9tL05vZGUu Y3BwCmluZGV4IGJmMjRiNTg3NjAyMWEyYjBmM2IxZGZlYjYwZWM0NDViMmMwNGJhODYuLmIyZmQ2 NWRkM2E1MTRjMWVhN2ZlOGFkNWM1MDViN2Y4ZGExYmEyNTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv ZG9tL05vZGUuY3BwCisrKyBiL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0xMDcxLDIxICsxMDcx LDI2IEBAIHZvaWQgTm9kZTo6Y2hlY2tTZXRQcmVmaXgoY29uc3QgQXRvbWljU3RyaW5nJiBwcmVm aXgsIEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgIC8vIEF0dHJpYnV0ZS1zcGVjaWZpYyBjaGVja3Mg YXJlIGluIEF0dHI6OnNldFByZWZpeCgpLgogfQogCi1ib29sIE5vZGU6OmNhblJlcGxhY2VDaGls ZChOb2RlKiBuZXdDaGlsZCwgTm9kZSopCitzdGF0aWMgYm9vbCBpc0NoaWxkVHlwZUFsbG93ZWQo Tm9kZSogcGFyZW50LCBOb2RlKiBjaGlsZCkKIHsKLSAgICBpZiAobmV3Q2hpbGQtPm5vZGVUeXBl KCkgIT0gRE9DVU1FTlRfRlJBR01FTlRfTk9ERSkgewotICAgICAgICBpZiAoIWNoaWxkVHlwZUFs bG93ZWQobmV3Q2hpbGQtPm5vZGVUeXBlKCkpKQorICAgIGlmIChjaGlsZC0+bm9kZVR5cGUoKSAh PSBwYXJlbnQtPkRPQ1VNRU5UX0ZSQUdNRU5UX05PREUpIHsKKyAgICAgICAgaWYgKCFwYXJlbnQt PmNoaWxkVHlwZUFsbG93ZWQoY2hpbGQtPm5vZGVUeXBlKCkpKQogICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGZvciAoTm9kZSAqbiA9IG5ld0NoaWxkLT5m aXJzdENoaWxkKCk7IG47IG4gPSBuLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgICAgICBpZiAo IWNoaWxkVHlwZUFsbG93ZWQobi0+bm9kZVR5cGUoKSkpIAorICAgICAgICBmb3IgKE5vZGUgKm4g PSBjaGlsZC0+Zmlyc3RDaGlsZCgpOyBuOyBuID0gbi0+bmV4dFNpYmxpbmcoKSkgeworICAgICAg ICAgICAgaWYgKCFwYXJlbnQtPmNoaWxkVHlwZUFsbG93ZWQobi0+bm9kZVR5cGUoKSkpIAogICAg ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4g dHJ1ZTsKIH0KIAotdm9pZCBOb2RlOjpjaGVja1JlcGxhY2VDaGlsZChOb2RlKiBuZXdDaGlsZCwg Tm9kZSogb2xkQ2hpbGQsIEV4Y2VwdGlvbkNvZGUmIGVjKQorYm9vbCBOb2RlOjpjYW5SZXBsYWNl Q2hpbGQoTm9kZSogbmV3Q2hpbGQsIE5vZGUqKQoreworICAgIHJldHVybiBpc0NoaWxkVHlwZUFs bG93ZWQodGhpcywgbmV3Q2hpbGQpOworfQorICAgIAorc3RhdGljIHZvaWQgY2hlY2tBY2NlcHRD aGlsZChOb2RlKiBwYXJlbnQsIE5vZGUqIG5ld0NoaWxkLCBFeGNlcHRpb25Db2RlJiBlYykKIHsK ICAgICAvLyBQZXJmb3JtIGVycm9yIGNoZWNraW5nIGFzIHJlcXVpcmVkIGJ5IHNwZWMgZm9yIGFk ZGluZyBhIG5ldyBjaGlsZC4gVXNlZCBieSByZXBsYWNlQ2hpbGQoKS4KICAgICAKQEAgLTEwOTYs MTEzICsxMTAxLDY5IEBAIHZvaWQgTm9kZTo6Y2hlY2tSZXBsYWNlQ2hpbGQoTm9kZSogbmV3Q2hp bGQsIE5vZGUqIG9sZENoaWxkLCBFeGNlcHRpb25Db2RlJiBlYykKICAgICB9CiAgICAgCiAgICAg Ly8gTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURfRVJSOiBSYWlzZWQgaWYgdGhpcyBub2RlIGlzIHJl YWRvbmx5Ci0gICAgaWYgKGlzUmVhZE9ubHlOb2RlKCkpIHsKKyAgICBpZiAocGFyZW50LT5pc1Jl YWRPbmx5Tm9kZSgpKSB7CiAgICAgICAgIGVjID0gTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURfRVJS OwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIAotICAgIGJvb2wgc2hvdWxkQWRvcHRDaGls ZCA9IGZhbHNlOwotICAgIAogICAgIC8vIFdST05HX0RPQ1VNRU5UX0VSUjogUmFpc2VkIGlmIG5l d0NoaWxkIHdhcyBjcmVhdGVkIGZyb20gYSBkaWZmZXJlbnQgZG9jdW1lbnQgdGhhbiB0aGUgb25l IHRoYXQKICAgICAvLyBjcmVhdGVkIHRoaXMgbm9kZS4KICAgICAvLyBXZSBhc3N1bWUgdGhhdCBp ZiBuZXdDaGlsZCBpcyBhIERvY3VtZW50RnJhZ21lbnQsIGFsbCBjaGlsZHJlbiBhcmUgY3JlYXRl ZCBmcm9tIHRoZSBzYW1lIGRvY3VtZW50CiAgICAgLy8gYXMgdGhlIGZyYWdtZW50IGl0c2VsZiAo b3RoZXJ3aXNlIHRoZXkgY291bGQgbm90IGhhdmUgYmVlbiBhZGRlZCBhcyBjaGlsZHJlbikKLSAg ICBpZiAobmV3Q2hpbGQtPmRvY3VtZW50KCkgIT0gZG9jdW1lbnQoKSkgeworICAgIGlmIChuZXdD aGlsZC0+ZG9jdW1lbnQoKSAhPSBwYXJlbnQtPmRvY3VtZW50KCkgJiYgbmV3Q2hpbGQtPmluRG9j dW1lbnQoKSkgewogICAgICAgICAvLyBidXQgaWYgdGhlIGNoaWxkIGlzIG5vdCBpbiBhIGRvY3Vt ZW50IHlldCB0aGVuIGxvb3NlbiB0aGUKICAgICAgICAgLy8gcmVzdHJpY3Rpb24sIHNvIHRoYXQg ZS5nLiBjcmVhdGluZyBhbiBlbGVtZW50IHdpdGggdGhlIE9wdGlvbigpCiAgICAgICAgIC8vIGNv bnN0cnVjdG9yIGFuZCB0aGVuIGFkZGluZyBpdCB0byBhIGRpZmZlcmVudCBkb2N1bWVudCB3b3Jr cywKICAgICAgICAgLy8gYXMgaXQgZG9lcyBpbiBNb3ppbGxhIGFuZCBNYWMgSUUuCi0gICAgICAg IGlmICghbmV3Q2hpbGQtPmluRG9jdW1lbnQoKSkgewotICAgICAgICAgICAgc2hvdWxkQWRvcHRD aGlsZCA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBlYyA9IFdST05HX0RP Q1VNRU5UX0VSUjsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQorICAgICAgICBlYyA9 IFdST05HX0RPQ1VNRU5UX0VSUjsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAKICAgICAv LyBISUVSQVJDSFlfUkVRVUVTVF9FUlI6IFJhaXNlZCBpZiB0aGlzIG5vZGUgaXMgb2YgYSB0eXBl IHRoYXQgZG9lcyBub3QgYWxsb3cgY2hpbGRyZW4gb2YgdGhlIHR5cGUgb2YgdGhlCiAgICAgLy8g bmV3Q2hpbGQgbm9kZSwgb3IgaWYgdGhlIG5vZGUgdG8gYXBwZW5kIGlzIG9uZSBvZiB0aGlzIG5v ZGUncyBhbmNlc3RvcnMuCi0gICAgCisKICAgICAvLyBjaGVjayBmb3IgYW5jZXN0b3Ivc2FtZSBu b2RlCi0gICAgaWYgKG5ld0NoaWxkID09IHRoaXMgfHwgaXNEZXNjZW5kYW50T2YobmV3Q2hpbGQp KSB7CisgICAgaWYgKG5ld0NoaWxkID09IHBhcmVudCB8fCBwYXJlbnQtPmlzRGVzY2VuZGFudE9m KG5ld0NoaWxkKSkgewogICAgICAgICBlYyA9IEhJRVJBUkNIWV9SRVFVRVNUX0VSUjsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KLSAgICAKLSAgICBpZiAoIWNhblJlcGxhY2VDaGlsZChuZXdDaGls ZCwgb2xkQ2hpbGQpKSB7Ci0gICAgICAgIGVjID0gSElFUkFSQ0hZX1JFUVVFU1RfRVJSOwotICAg ICAgICByZXR1cm47Ci0gICAgfQotICAgICAgIAotICAgIC8vIGNoYW5nZSB0aGUgZG9jdW1lbnQg cG9pbnRlciBvZiBuZXdDaGlsZCBhbmQgYWxsIG9mIGl0cyBjaGlsZHJlbiB0byBiZSB0aGUgbmV3 IGRvY3VtZW50Ci0gICAgaWYgKHNob3VsZEFkb3B0Q2hpbGQpCi0gICAgICAgIGZvciAoTm9kZSog bm9kZSA9IG5ld0NoaWxkOyBub2RlOyBub2RlID0gbm9kZS0+dHJhdmVyc2VOZXh0Tm9kZShuZXdD aGlsZCkpCi0gICAgICAgICAgICBub2RlLT5zZXREb2N1bWVudChkb2N1bWVudCgpKTsKIH0KIAot dm9pZCBOb2RlOjpjaGVja0FkZENoaWxkKE5vZGUgKm5ld0NoaWxkLCBFeGNlcHRpb25Db2RlJiBl YykKK3N0YXRpYyB2b2lkIHRyYW5zZmVyT3duZXJEb2N1bWVudChEb2N1bWVudCogbmV3RG9jdW1l bnQsIE5vZGUqIHJvb3QpCiB7Ci0gICAgLy8gUGVyZm9ybSBlcnJvciBjaGVja2luZyBhcyByZXF1 aXJlZCBieSBzcGVjIGZvciBhZGRpbmcgYSBuZXcgY2hpbGQuIFVzZWQgYnkgYXBwZW5kQ2hpbGQo KSBhbmQgaW5zZXJ0QmVmb3JlKCkuCi0KLSAgICAvLyBOb3QgbWVudGlvbmVkIGluIHNwZWM6IHRo cm93IE5PVF9GT1VORF9FUlIgaWYgbmV3Q2hpbGQgaXMgbnVsbAotICAgIGlmICghbmV3Q2hpbGQp IHsKLSAgICAgICAgZWMgPSBOT1RfRk9VTkRfRVJSOwotICAgICAgICByZXR1cm47CisgICAgLy8g RklYTUU6IFRvIG1hdGNoIEdlY2tvLCB3ZSBzaG91bGQgZG8gdGhpcyBmb3Igbm9kZXMgdGhhdCBh cmUgYWxyZWFkeSBpbiB0aGUgZG9jdW1lbnQgYXMgd2VsbC4KKyAgICBpZiAocm9vdC0+ZG9jdW1l bnQoKSAhPSBuZXdEb2N1bWVudCAmJiAhcm9vdC0+aW5Eb2N1bWVudCgpKSB7CisgICAgICAgIGZv ciAoTm9kZSogbm9kZSA9IHJvb3Q7IG5vZGU7IG5vZGUgPSBub2RlLT50cmF2ZXJzZU5leHROb2Rl KHJvb3QpKQorICAgICAgICAgICAgbm9kZS0+c2V0RG9jdW1lbnQobmV3RG9jdW1lbnQpOwogICAg IH0KK30KIAotICAgIC8vIE5PX01PRElGSUNBVElPTl9BTExPV0VEX0VSUjogUmFpc2VkIGlmIHRo aXMgbm9kZSBpcyByZWFkb25seQotICAgIGlmIChpc1JlYWRPbmx5Tm9kZSgpKSB7Ci0gICAgICAg IGVjID0gTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURfRVJSOwordm9pZCBOb2RlOjpjaGVja1JlcGxh Y2VDaGlsZChOb2RlKiBuZXdDaGlsZCwgTm9kZSogb2xkQ2hpbGQsIEV4Y2VwdGlvbkNvZGUmIGVj KQoreworICAgIGNoZWNrQWNjZXB0Q2hpbGQodGhpcywgbmV3Q2hpbGQsIGVjKTsKKyAgICBpZiAo ZWMpCiAgICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBib29sIHNob3VsZEFkb3B0Q2hpbGQg PSBmYWxzZTsKIAotICAgIC8vIFdST05HX0RPQ1VNRU5UX0VSUjogUmFpc2VkIGlmIG5ld0NoaWxk IHdhcyBjcmVhdGVkIGZyb20gYSBkaWZmZXJlbnQgZG9jdW1lbnQgdGhhbiB0aGUgb25lIHRoYXQK LSAgICAvLyBjcmVhdGVkIHRoaXMgbm9kZS4KLSAgICAvLyBXZSBhc3N1bWUgdGhhdCBpZiBuZXdD aGlsZCBpcyBhIERvY3VtZW50RnJhZ21lbnQsIGFsbCBjaGlsZHJlbiBhcmUgY3JlYXRlZCBmcm9t IHRoZSBzYW1lIGRvY3VtZW50Ci0gICAgLy8gYXMgdGhlIGZyYWdtZW50IGl0c2VsZiAob3RoZXJ3 aXNlIHRoZXkgY291bGQgbm90IGhhdmUgYmVlbiBhZGRlZCBhcyBjaGlsZHJlbikKLSAgICBpZiAo bmV3Q2hpbGQtPmRvY3VtZW50KCkgIT0gZG9jdW1lbnQoKSkgewotICAgICAgICAvLyBidXQgaWYg dGhlIGNoaWxkIGlzIG5vdCBpbiBhIGRvY3VtZW50IHlldCB0aGVuIGxvb3NlbiB0aGUKLSAgICAg ICAgLy8gcmVzdHJpY3Rpb24sIHNvIHRoYXQgZS5nLiBjcmVhdGluZyBhbiBlbGVtZW50IHdpdGgg dGhlIE9wdGlvbigpCi0gICAgICAgIC8vIGNvbnN0cnVjdG9yIGFuZCB0aGVuIGFkZGluZyBpdCB0 byBhIGRpZmZlcmVudCBkb2N1bWVudCB3b3JrcywKLSAgICAgICAgLy8gYXMgaXQgZG9lcyBpbiBN b3ppbGxhIGFuZCBNYWMgSUUuCi0gICAgICAgIGlmICghbmV3Q2hpbGQtPmluRG9jdW1lbnQoKSkg ewotICAgICAgICAgICAgc2hvdWxkQWRvcHRDaGlsZCA9IHRydWU7Ci0gICAgICAgIH0gZWxzZSB7 Ci0gICAgICAgICAgICBlYyA9IFdST05HX0RPQ1VNRU5UX0VSUjsKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgfQorICAgIGlmICghY2FuUmVwbGFjZUNoaWxkKG5ld0NoaWxkLCBvbGRDaGls ZCkpIHsKKyAgICAgICAgZWMgPSBISUVSQVJDSFlfUkVRVUVTVF9FUlI7CisgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICAvLyBISUVSQVJDSFlfUkVRVUVTVF9FUlI6IFJhaXNlZCBpZiB0aGlz IG5vZGUgaXMgb2YgYSB0eXBlIHRoYXQgZG9lcyBub3QgYWxsb3cgY2hpbGRyZW4gb2YgdGhlIHR5 cGUgb2YgdGhlCi0gICAgLy8gbmV3Q2hpbGQgbm9kZSwgb3IgaWYgdGhlIG5vZGUgdG8gYXBwZW5k IGlzIG9uZSBvZiB0aGlzIG5vZGUncyBhbmNlc3RvcnMuCisgICAgdHJhbnNmZXJPd25lckRvY3Vt ZW50KGRvY3VtZW50KCksIG5ld0NoaWxkKTsKK30KIAotICAgIC8vIGNoZWNrIGZvciBhbmNlc3Rv ci9zYW1lIG5vZGUKLSAgICBpZiAobmV3Q2hpbGQgPT0gdGhpcyB8fCBpc0Rlc2NlbmRhbnRPZihu ZXdDaGlsZCkpIHsKLSAgICAgICAgZWMgPSBISUVSQVJDSFlfUkVRVUVTVF9FUlI7Cit2b2lkIE5v ZGU6OmNoZWNrQWRkQ2hpbGQoTm9kZSAqbmV3Q2hpbGQsIEV4Y2VwdGlvbkNvZGUmIGVjKQorewor ICAgIGNoZWNrQWNjZXB0Q2hpbGQodGhpcywgbmV3Q2hpbGQsIGVjKTsKKyAgICBpZiAoZWMpCiAg ICAgICAgIHJldHVybjsKLSAgICB9CiAgICAgCi0gICAgaWYgKG5ld0NoaWxkLT5ub2RlVHlwZSgp ICE9IERPQ1VNRU5UX0ZSQUdNRU5UX05PREUpIHsKLSAgICAgICAgaWYgKCFjaGlsZFR5cGVBbGxv d2VkKG5ld0NoaWxkLT5ub2RlVHlwZSgpKSkgewotICAgICAgICAgICAgZWMgPSBISUVSQVJDSFlf UkVRVUVTVF9FUlI7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICB9Ci0gICAg ZWxzZSB7Ci0gICAgICAgIGZvciAoTm9kZSAqbiA9IG5ld0NoaWxkLT5maXJzdENoaWxkKCk7IG47 IG4gPSBuLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgICAgICBpZiAoIWNoaWxkVHlwZUFsbG93 ZWQobi0+bm9kZVR5cGUoKSkpIHsKLSAgICAgICAgICAgICAgICBlYyA9IEhJRVJBUkNIWV9SRVFV RVNUX0VSUjsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAgICAg IH0KKyAgICBpZiAoIWlzQ2hpbGRUeXBlQWxsb3dlZCh0aGlzLCBuZXdDaGlsZCkpIHsKKyAgICAg ICAgZWMgPSBISUVSQVJDSFlfUkVRVUVTVF9FUlI7CisgICAgICAgIHJldHVybjsKICAgICB9Ci0g ICAgCi0gICAgLy8gY2hhbmdlIHRoZSBkb2N1bWVudCBwb2ludGVyIG9mIG5ld0NoaWxkIGFuZCBh bGwgb2YgaXRzIGNoaWxkcmVuIHRvIGJlIHRoZSBuZXcgZG9jdW1lbnQKLSAgICBpZiAoc2hvdWxk QWRvcHRDaGlsZCkKLSAgICAgICAgZm9yIChOb2RlKiBub2RlID0gbmV3Q2hpbGQ7IG5vZGU7IG5v ZGUgPSBub2RlLT50cmF2ZXJzZU5leHROb2RlKG5ld0NoaWxkKSkKLSAgICAgICAgICAgIG5vZGUt PnNldERvY3VtZW50KGRvY3VtZW50KCkpOworCisgICAgdHJhbnNmZXJPd25lckRvY3VtZW50KGRv Y3VtZW50KCksIG5ld0NoaWxkKTsKIH0KIAogYm9vbCBOb2RlOjppc0Rlc2NlbmRhbnRPZihjb25z dCBOb2RlICpvdGhlcikgY29uc3QK 66069 2010-08-31 10:33:57 -0700 2010-08-31 10:44:54 -0700 Patch bug-44962-20100831103356.patch text/plain 7973 ojan ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzlkMWUyYTZlZWYxOTcyMTc2NDk2YmM3NTA5OTgzZTQ0ZGI5NGUzNC4uODcxMmVjNWZhOTlmZmNl MzQwMmViNjk0MDE2YzZlODZjZmMxNTM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wOC0zMSAgT2ph biBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGRlZHVwbGljYXRlIGNvZGUgZnJvbSBOb2RlOjpjaGVja1Jl cGxhY2VDaGlsZCBhbmQgTm9kZTo6Y2hlY2tBZGRDaGlsZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ5NjIKKworICAgICAgICBSZW1vdmUgZHVwbGlj YXRlIGNvZGUgaW4gcHJlcGFyYXRpb24gZm9yIGZpeGluZyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk1MjQKKyAgICAgICAgTm8gbmV3IHRlc3RzIHNpbmNlIHRoZXJl IGlzIG5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogZG9tL05vZGUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6aXNDaGlsZFR5cGVBbGxvd2VkKToKKyAgICAgICAgKFdlYkNv cmU6Ok5vZGU6OmNhblJlcGxhY2VDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpjaGVja0FjY2Vw dENoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OnRyYW5zZmVyT3duZXJEb2N1bWVudCk6CisgICAg ICAgIChXZWJDb3JlOjpOb2RlOjpjaGVja1JlcGxhY2VDaGlsZCk6CisgICAgICAgIChXZWJDb3Jl OjpOb2RlOjpjaGVja0FkZENoaWxkKToKKwogMjAxMC0wOC0zMCAgQWxlamFuZHJvIEcuIENhc3Ry byAgPGFsZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0aW4gUm9iaW5z b24uCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1dlYkNvcmUvZG9tL05vZGUu Y3BwCmluZGV4IGJmMjRiNTg3NjAyMWEyYjBmM2IxZGZlYjYwZWM0NDViMmMwNGJhODYuLjUzZGU2 YzVjNDY5NWUyMDNhMDNhN2JkZjNkODgwNjVmZmRmMTY5MTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv ZG9tL05vZGUuY3BwCisrKyBiL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC0xMDcxLDIxICsxMDcx LDI3IEBAIHZvaWQgTm9kZTo6Y2hlY2tTZXRQcmVmaXgoY29uc3QgQXRvbWljU3RyaW5nJiBwcmVm aXgsIEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgIC8vIEF0dHJpYnV0ZS1zcGVjaWZpYyBjaGVja3Mg YXJlIGluIEF0dHI6OnNldFByZWZpeCgpLgogfQogCi1ib29sIE5vZGU6OmNhblJlcGxhY2VDaGls ZChOb2RlKiBuZXdDaGlsZCwgTm9kZSopCitzdGF0aWMgYm9vbCBpc0NoaWxkVHlwZUFsbG93ZWQo Tm9kZSogcGFyZW50LCBOb2RlKiBjaGlsZCkKIHsKLSAgICBpZiAobmV3Q2hpbGQtPm5vZGVUeXBl KCkgIT0gRE9DVU1FTlRfRlJBR01FTlRfTk9ERSkgewotICAgICAgICBpZiAoIWNoaWxkVHlwZUFs bG93ZWQobmV3Q2hpbGQtPm5vZGVUeXBlKCkpKQorICAgIGlmIChjaGlsZC0+bm9kZVR5cGUoKSAh PSBwYXJlbnQtPkRPQ1VNRU5UX0ZSQUdNRU5UX05PREUpIHsKKyAgICAgICAgaWYgKCFwYXJlbnQt PmNoaWxkVHlwZUFsbG93ZWQoY2hpbGQtPm5vZGVUeXBlKCkpKQogICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGZvciAoTm9kZSAqbiA9IG5ld0NoaWxkLT5m aXJzdENoaWxkKCk7IG47IG4gPSBuLT5uZXh0U2libGluZygpKSB7Ci0gICAgICAgICAgICBpZiAo IWNoaWxkVHlwZUFsbG93ZWQobi0+bm9kZVR5cGUoKSkpIAotICAgICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKLSAgICAgICAgfQogICAgIH0KKyAgICAKKyAgICBmb3IgKE5vZGUgKm4gPSBjaGls ZC0+Zmlyc3RDaGlsZCgpOyBuOyBuID0gbi0+bmV4dFNpYmxpbmcoKSkgeworICAgICAgICBpZiAo IXBhcmVudC0+Y2hpbGRUeXBlQWxsb3dlZChuLT5ub2RlVHlwZSgpKSkKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICB9CisKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotdm9pZCBOb2RlOjpj aGVja1JlcGxhY2VDaGlsZChOb2RlKiBuZXdDaGlsZCwgTm9kZSogb2xkQ2hpbGQsIEV4Y2VwdGlv bkNvZGUmIGVjKQorYm9vbCBOb2RlOjpjYW5SZXBsYWNlQ2hpbGQoTm9kZSogbmV3Q2hpbGQsIE5v ZGUqKQoreworICAgIHJldHVybiBpc0NoaWxkVHlwZUFsbG93ZWQodGhpcywgbmV3Q2hpbGQpOwor fQorCitzdGF0aWMgdm9pZCBjaGVja0FjY2VwdENoaWxkKE5vZGUqIHBhcmVudCwgTm9kZSogbmV3 Q2hpbGQsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIC8vIFBlcmZvcm0gZXJyb3IgY2hlY2tp bmcgYXMgcmVxdWlyZWQgYnkgc3BlYyBmb3IgYWRkaW5nIGEgbmV3IGNoaWxkLiBVc2VkIGJ5IHJl cGxhY2VDaGlsZCgpLgogICAgIApAQCAtMTA5NiwxMTMgKzExMDIsNjkgQEAgdm9pZCBOb2RlOjpj aGVja1JlcGxhY2VDaGlsZChOb2RlKiBuZXdDaGlsZCwgTm9kZSogb2xkQ2hpbGQsIEV4Y2VwdGlv bkNvZGUmIGVjKQogICAgIH0KICAgICAKICAgICAvLyBOT19NT0RJRklDQVRJT05fQUxMT1dFRF9F UlI6IFJhaXNlZCBpZiB0aGlzIG5vZGUgaXMgcmVhZG9ubHkKLSAgICBpZiAoaXNSZWFkT25seU5v ZGUoKSkgeworICAgIGlmIChwYXJlbnQtPmlzUmVhZE9ubHlOb2RlKCkpIHsKICAgICAgICAgZWMg PSBOT19NT0RJRklDQVRJT05fQUxMT1dFRF9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgCi0gICAgYm9vbCBzaG91bGRBZG9wdENoaWxkID0gZmFsc2U7Ci0gICAgCiAgICAgLy8gV1JP TkdfRE9DVU1FTlRfRVJSOiBSYWlzZWQgaWYgbmV3Q2hpbGQgd2FzIGNyZWF0ZWQgZnJvbSBhIGRp ZmZlcmVudCBkb2N1bWVudCB0aGFuIHRoZSBvbmUgdGhhdAogICAgIC8vIGNyZWF0ZWQgdGhpcyBu b2RlLgogICAgIC8vIFdlIGFzc3VtZSB0aGF0IGlmIG5ld0NoaWxkIGlzIGEgRG9jdW1lbnRGcmFn bWVudCwgYWxsIGNoaWxkcmVuIGFyZSBjcmVhdGVkIGZyb20gdGhlIHNhbWUgZG9jdW1lbnQKICAg ICAvLyBhcyB0aGUgZnJhZ21lbnQgaXRzZWxmIChvdGhlcndpc2UgdGhleSBjb3VsZCBub3QgaGF2 ZSBiZWVuIGFkZGVkIGFzIGNoaWxkcmVuKQotICAgIGlmIChuZXdDaGlsZC0+ZG9jdW1lbnQoKSAh PSBkb2N1bWVudCgpKSB7CisgICAgaWYgKG5ld0NoaWxkLT5kb2N1bWVudCgpICE9IHBhcmVudC0+ ZG9jdW1lbnQoKSAmJiBuZXdDaGlsZC0+aW5Eb2N1bWVudCgpKSB7CiAgICAgICAgIC8vIGJ1dCBp ZiB0aGUgY2hpbGQgaXMgbm90IGluIGEgZG9jdW1lbnQgeWV0IHRoZW4gbG9vc2VuIHRoZQogICAg ICAgICAvLyByZXN0cmljdGlvbiwgc28gdGhhdCBlLmcuIGNyZWF0aW5nIGFuIGVsZW1lbnQgd2l0 aCB0aGUgT3B0aW9uKCkKICAgICAgICAgLy8gY29uc3RydWN0b3IgYW5kIHRoZW4gYWRkaW5nIGl0 IHRvIGEgZGlmZmVyZW50IGRvY3VtZW50IHdvcmtzLAogICAgICAgICAvLyBhcyBpdCBkb2VzIGlu IE1vemlsbGEgYW5kIE1hYyBJRS4KLSAgICAgICAgaWYgKCFuZXdDaGlsZC0+aW5Eb2N1bWVudCgp KSB7Ci0gICAgICAgICAgICBzaG91bGRBZG9wdENoaWxkID0gdHJ1ZTsKLSAgICAgICAgfSBlbHNl IHsKLSAgICAgICAgICAgIGVjID0gV1JPTkdfRE9DVU1FTlRfRVJSOwotICAgICAgICAgICAgcmV0 dXJuOwotICAgICAgICB9CisgICAgICAgIGVjID0gV1JPTkdfRE9DVU1FTlRfRVJSOworICAgICAg ICByZXR1cm47CiAgICAgfQogICAgIAogICAgIC8vIEhJRVJBUkNIWV9SRVFVRVNUX0VSUjogUmFp c2VkIGlmIHRoaXMgbm9kZSBpcyBvZiBhIHR5cGUgdGhhdCBkb2VzIG5vdCBhbGxvdyBjaGlsZHJl biBvZiB0aGUgdHlwZSBvZiB0aGUKICAgICAvLyBuZXdDaGlsZCBub2RlLCBvciBpZiB0aGUgbm9k ZSB0byBhcHBlbmQgaXMgb25lIG9mIHRoaXMgbm9kZSdzIGFuY2VzdG9ycy4KLSAgICAKKwogICAg IC8vIGNoZWNrIGZvciBhbmNlc3Rvci9zYW1lIG5vZGUKLSAgICBpZiAobmV3Q2hpbGQgPT0gdGhp cyB8fCBpc0Rlc2NlbmRhbnRPZihuZXdDaGlsZCkpIHsKKyAgICBpZiAobmV3Q2hpbGQgPT0gcGFy ZW50IHx8IHBhcmVudC0+aXNEZXNjZW5kYW50T2YobmV3Q2hpbGQpKSB7CiAgICAgICAgIGVjID0g SElFUkFSQ0hZX1JFUVVFU1RfRVJSOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIAotICAg IGlmICghY2FuUmVwbGFjZUNoaWxkKG5ld0NoaWxkLCBvbGRDaGlsZCkpIHsKLSAgICAgICAgZWMg PSBISUVSQVJDSFlfUkVRVUVTVF9FUlI7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgICAg Ci0gICAgLy8gY2hhbmdlIHRoZSBkb2N1bWVudCBwb2ludGVyIG9mIG5ld0NoaWxkIGFuZCBhbGwg b2YgaXRzIGNoaWxkcmVuIHRvIGJlIHRoZSBuZXcgZG9jdW1lbnQKLSAgICBpZiAoc2hvdWxkQWRv cHRDaGlsZCkKLSAgICAgICAgZm9yIChOb2RlKiBub2RlID0gbmV3Q2hpbGQ7IG5vZGU7IG5vZGUg PSBub2RlLT50cmF2ZXJzZU5leHROb2RlKG5ld0NoaWxkKSkKLSAgICAgICAgICAgIG5vZGUtPnNl dERvY3VtZW50KGRvY3VtZW50KCkpOwogfQogCi12b2lkIE5vZGU6OmNoZWNrQWRkQ2hpbGQoTm9k ZSAqbmV3Q2hpbGQsIEV4Y2VwdGlvbkNvZGUmIGVjKQorc3RhdGljIHZvaWQgdHJhbnNmZXJPd25l ckRvY3VtZW50KERvY3VtZW50KiBuZXdEb2N1bWVudCwgTm9kZSogcm9vdCkKIHsKLSAgICAvLyBQ ZXJmb3JtIGVycm9yIGNoZWNraW5nIGFzIHJlcXVpcmVkIGJ5IHNwZWMgZm9yIGFkZGluZyBhIG5l dyBjaGlsZC4gVXNlZCBieSBhcHBlbmRDaGlsZCgpIGFuZCBpbnNlcnRCZWZvcmUoKS4KLQotICAg IC8vIE5vdCBtZW50aW9uZWQgaW4gc3BlYzogdGhyb3cgTk9UX0ZPVU5EX0VSUiBpZiBuZXdDaGls ZCBpcyBudWxsCi0gICAgaWYgKCFuZXdDaGlsZCkgewotICAgICAgICBlYyA9IE5PVF9GT1VORF9F UlI7Ci0gICAgICAgIHJldHVybjsKKyAgICAvLyBGSVhNRTogVG8gbWF0Y2ggR2Vja28sIHdlIHNo b3VsZCBkbyB0aGlzIGZvciBub2RlcyB0aGF0IGFyZSBhbHJlYWR5IGluIHRoZSBkb2N1bWVudCBh cyB3ZWxsLgorICAgIGlmIChyb290LT5kb2N1bWVudCgpICE9IG5ld0RvY3VtZW50ICYmICFyb290 LT5pbkRvY3VtZW50KCkpIHsKKyAgICAgICAgZm9yIChOb2RlKiBub2RlID0gcm9vdDsgbm9kZTsg bm9kZSA9IG5vZGUtPnRyYXZlcnNlTmV4dE5vZGUocm9vdCkpCisgICAgICAgICAgICBub2RlLT5z ZXREb2N1bWVudChuZXdEb2N1bWVudCk7CiAgICAgfQorfQogCi0gICAgLy8gTk9fTU9ESUZJQ0FU SU9OX0FMTE9XRURfRVJSOiBSYWlzZWQgaWYgdGhpcyBub2RlIGlzIHJlYWRvbmx5Ci0gICAgaWYg KGlzUmVhZE9ubHlOb2RlKCkpIHsKLSAgICAgICAgZWMgPSBOT19NT0RJRklDQVRJT05fQUxMT1dF RF9FUlI7Cit2b2lkIE5vZGU6OmNoZWNrUmVwbGFjZUNoaWxkKE5vZGUqIG5ld0NoaWxkLCBOb2Rl KiBvbGRDaGlsZCwgRXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAgY2hlY2tBY2NlcHRDaGlsZCh0 aGlzLCBuZXdDaGlsZCwgZWMpOworICAgIGlmIChlYykKICAgICAgICAgcmV0dXJuOwotICAgIH0K LQotICAgIGJvb2wgc2hvdWxkQWRvcHRDaGlsZCA9IGZhbHNlOwogCi0gICAgLy8gV1JPTkdfRE9D VU1FTlRfRVJSOiBSYWlzZWQgaWYgbmV3Q2hpbGQgd2FzIGNyZWF0ZWQgZnJvbSBhIGRpZmZlcmVu dCBkb2N1bWVudCB0aGFuIHRoZSBvbmUgdGhhdAotICAgIC8vIGNyZWF0ZWQgdGhpcyBub2RlLgot ICAgIC8vIFdlIGFzc3VtZSB0aGF0IGlmIG5ld0NoaWxkIGlzIGEgRG9jdW1lbnRGcmFnbWVudCwg YWxsIGNoaWxkcmVuIGFyZSBjcmVhdGVkIGZyb20gdGhlIHNhbWUgZG9jdW1lbnQKLSAgICAvLyBh cyB0aGUgZnJhZ21lbnQgaXRzZWxmIChvdGhlcndpc2UgdGhleSBjb3VsZCBub3QgaGF2ZSBiZWVu IGFkZGVkIGFzIGNoaWxkcmVuKQotICAgIGlmIChuZXdDaGlsZC0+ZG9jdW1lbnQoKSAhPSBkb2N1 bWVudCgpKSB7Ci0gICAgICAgIC8vIGJ1dCBpZiB0aGUgY2hpbGQgaXMgbm90IGluIGEgZG9jdW1l bnQgeWV0IHRoZW4gbG9vc2VuIHRoZQotICAgICAgICAvLyByZXN0cmljdGlvbiwgc28gdGhhdCBl LmcuIGNyZWF0aW5nIGFuIGVsZW1lbnQgd2l0aCB0aGUgT3B0aW9uKCkKLSAgICAgICAgLy8gY29u c3RydWN0b3IgYW5kIHRoZW4gYWRkaW5nIGl0IHRvIGEgZGlmZmVyZW50IGRvY3VtZW50IHdvcmtz LAotICAgICAgICAvLyBhcyBpdCBkb2VzIGluIE1vemlsbGEgYW5kIE1hYyBJRS4KLSAgICAgICAg aWYgKCFuZXdDaGlsZC0+aW5Eb2N1bWVudCgpKSB7Ci0gICAgICAgICAgICBzaG91bGRBZG9wdENo aWxkID0gdHJ1ZTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGVjID0gV1JPTkdfRE9D VU1FTlRfRVJSOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CisgICAgaWYgKCFjYW5S ZXBsYWNlQ2hpbGQobmV3Q2hpbGQsIG9sZENoaWxkKSkgeworICAgICAgICBlYyA9IEhJRVJBUkNI WV9SRVFVRVNUX0VSUjsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIC8vIEhJRVJBUkNI WV9SRVFVRVNUX0VSUjogUmFpc2VkIGlmIHRoaXMgbm9kZSBpcyBvZiBhIHR5cGUgdGhhdCBkb2Vz IG5vdCBhbGxvdyBjaGlsZHJlbiBvZiB0aGUgdHlwZSBvZiB0aGUKLSAgICAvLyBuZXdDaGlsZCBu b2RlLCBvciBpZiB0aGUgbm9kZSB0byBhcHBlbmQgaXMgb25lIG9mIHRoaXMgbm9kZSdzIGFuY2Vz dG9ycy4KKyAgICB0cmFuc2Zlck93bmVyRG9jdW1lbnQoZG9jdW1lbnQoKSwgbmV3Q2hpbGQpOwor fQogCi0gICAgLy8gY2hlY2sgZm9yIGFuY2VzdG9yL3NhbWUgbm9kZQotICAgIGlmIChuZXdDaGls ZCA9PSB0aGlzIHx8IGlzRGVzY2VuZGFudE9mKG5ld0NoaWxkKSkgewotICAgICAgICBlYyA9IEhJ RVJBUkNIWV9SRVFVRVNUX0VSUjsKK3ZvaWQgTm9kZTo6Y2hlY2tBZGRDaGlsZChOb2RlICpuZXdD aGlsZCwgRXhjZXB0aW9uQ29kZSYgZWMpCit7CisgICAgY2hlY2tBY2NlcHRDaGlsZCh0aGlzLCBu ZXdDaGlsZCwgZWMpOworICAgIGlmIChlYykKICAgICAgICAgcmV0dXJuOwotICAgIH0KICAgICAK LSAgICBpZiAobmV3Q2hpbGQtPm5vZGVUeXBlKCkgIT0gRE9DVU1FTlRfRlJBR01FTlRfTk9ERSkg ewotICAgICAgICBpZiAoIWNoaWxkVHlwZUFsbG93ZWQobmV3Q2hpbGQtPm5vZGVUeXBlKCkpKSB7 Ci0gICAgICAgICAgICBlYyA9IEhJRVJBUkNIWV9SRVFVRVNUX0VSUjsKLSAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgfQotICAgIH0KLSAgICBlbHNlIHsKLSAgICAgICAgZm9yIChOb2RlICpu ID0gbmV3Q2hpbGQtPmZpcnN0Q2hpbGQoKTsgbjsgbiA9IG4tPm5leHRTaWJsaW5nKCkpIHsKLSAg ICAgICAgICAgIGlmICghY2hpbGRUeXBlQWxsb3dlZChuLT5ub2RlVHlwZSgpKSkgewotICAgICAg ICAgICAgICAgIGVjID0gSElFUkFSQ0hZX1JFUVVFU1RfRVJSOwotICAgICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQorICAgIGlmICghaXNDaGlsZFR5cGVBbGxv d2VkKHRoaXMsIG5ld0NoaWxkKSkgeworICAgICAgICBlYyA9IEhJRVJBUkNIWV9SRVFVRVNUX0VS UjsKKyAgICAgICAgcmV0dXJuOwogICAgIH0KLSAgICAKLSAgICAvLyBjaGFuZ2UgdGhlIGRvY3Vt ZW50IHBvaW50ZXIgb2YgbmV3Q2hpbGQgYW5kIGFsbCBvZiBpdHMgY2hpbGRyZW4gdG8gYmUgdGhl IG5ldyBkb2N1bWVudAotICAgIGlmIChzaG91bGRBZG9wdENoaWxkKQotICAgICAgICBmb3IgKE5v ZGUqIG5vZGUgPSBuZXdDaGlsZDsgbm9kZTsgbm9kZSA9IG5vZGUtPnRyYXZlcnNlTmV4dE5vZGUo bmV3Q2hpbGQpKQotICAgICAgICAgICAgbm9kZS0+c2V0RG9jdW1lbnQoZG9jdW1lbnQoKSk7CisK KyAgICB0cmFuc2Zlck93bmVyRG9jdW1lbnQoZG9jdW1lbnQoKSwgbmV3Q2hpbGQpOwogfQogCiBi b29sIE5vZGU6OmlzRGVzY2VuZGFudE9mKGNvbnN0IE5vZGUgKm90aGVyKSBjb25zdAo=