79943 2012-02-29 14:10:25 -0800 Sync PageCache debugging with PageCache behaviour 2012-03-02 12:11:41 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gavinp gavinp abarth beidson japhet webkit.review.bot oldest_to_newest 567916 0 gavinp 2012-02-29 14:10:25 -0800 Sync PageCache debugging with PageCache behaviour 567937 1 129517 gavinp 2012-02-29 14:23:33 -0800 Created attachment 129517 Patch 567939 2 gavinp 2012-02-29 14:24:43 -0800 This is the clean-up-the-debugging part of now-retired Bug 79269. 569629 3 129517 webkit.review.bot 2012-03-02 06:46:30 -0800 Comment on attachment 129517 Patch Rejecting attachment 129517 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: as type 'int' Source/WebCore/history/PageCache.cpp:209: error: cannot pass objects of non-POD type 'class WTF::String' through '...'; call will abort at runtime Source/WebCore/history/PageCache.cpp:209: error: format '%s' expects type 'char*', but argument 5 has type 'int' CXX(target) out/Debug/obj.target/webcore_remaining/Source/WebCore/inspector/DOMEditor.o make: *** [out/Debug/obj.target/webcore_remaining/Source/WebCore/history/PageCache.o] Error 1 make: *** Waiting for unfinished jobs.... Full output: http://queues.webkit.org/results/11751954 569722 4 129915 gavinp 2012-03-02 10:01:47 -0800 Created attachment 129915 Patch 569724 5 gavinp 2012-03-02 10:02:48 -0800 It seems I neglected to test my patch on Chromium. Now done, I'll wait on EWS and then cq+. 569786 6 129915 abarth 2012-03-02 11:27:35 -0800 Comment on attachment 129915 Patch Forwarding beidson's r+. 569830 7 129915 webkit.review.bot 2012-03-02 12:11:35 -0800 Comment on attachment 129915 Patch Clearing flags on attachment: 129915 Committed r109598: <http://trac.webkit.org/changeset/109598> 569831 8 webkit.review.bot 2012-03-02 12:11:41 -0800 All reviewed patches have been landed. Closing bug. 129517 2012-02-29 14:23:33 -0800 2012-03-02 10:01:42 -0800 Patch bug-79943-20120229172332.patch text/plain 4873 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MjA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdjOTUwMTZiZGEwN2Vh ZTE3MWEzYTJmMWFmYjUwYjYxZmRiZjkxOC4uNjc1YmVjZTJhMzJmMjE2MWJlMDlhNGU0NmZjNWM5 ZGJhZDFmNDZjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAyLTI5ICBHYXZp biBQZXRlcnMgIDxnYXZpbnBAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN5bmMgUGFnZUNhY2hl IGRlYnVnZ2luZyB3aXRoIFBhZ2VDYWNoZSBiZWhhdmlvdXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5OTQzCisKKyAgICAgICAgU3luYyB1cCB0aGUg ZGVidWcgcHJpbnRpbmcgY29kZSBpbiBQYWdlQ2FjaGUgd2l0aCB0aGUgYWN0dWFsIGxvZ2ljLAor ICAgICAgICBhbmQgY2xlYW4gdXAgdGhlIGRlYnVnIHByaW50aW5nIGF0IHRoZSBzYW1lIHRpbWUu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLCBhcyB0aGlzIGlzIGEgcmVmYWN0b3Igb2YgZGVidWcgb25seSBjb2RlLgorCisgICAg ICAgICogaGlzdG9yeS9QYWdlQ2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAg IChXZWJDb3JlOjpsb2dDYW5DYWNoZUZyYW1lRGVjaXNpb24pOgorICAgICAgICAoV2ViQ29yZTo6 bG9nQ2FuQ2FjaGVQYWdlRGVjaXNpb24pOgorCiAyMDEyLTAyLTI4ICBZdXJ5IFNlbWlraGF0c2t5 ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IG1vdmUgRE9N IGNvdW50ZXIgZ3JhcGhzIG91dCBvZiBleHBlcmltZW50YWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFn ZUNhY2hlLmNwcAppbmRleCBhMGQ1ZGU0ZDk0ZjYwMGU3ZGQ3NzcxYTM2ODk3YmEzOWY1ZDMxOThi Li5jZDI2MDY4YzI5ZDI1NWZhN2EyNzRkNTZlN2ZmNzdiZmVlNzRiNjcxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aGlzdG9yeS9QYWdlQ2FjaGUuY3BwCkBAIC01NywyNyArNTcsNyBAQCBzdGF0aWMgY29uc3QgZG91 YmxlIGF1dG9yZWxlYXNlSW50ZXJ2YWwgPSAzOwogCiAjaWZuZGVmIE5ERUJVRwogCi1zdGF0aWMg U3RyaW5nJiBwYWdlQ2FjaGVMb2dQcmVmaXgoaW50IGluZGVudExldmVsKQotewotICAgIHN0YXRp YyBpbnQgcHJldmlvdXNJbmRlbnQgPSAtMTsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmlu ZywgcHJlZml4LCAoKSk7Ci0gICAgCi0gICAgaWYgKGluZGVudExldmVsICE9IHByZXZpb3VzSW5k ZW50KSB7ICAgIAotICAgICAgICBwcmV2aW91c0luZGVudCA9IGluZGVudExldmVsOwotICAgICAg ICBwcmVmaXgudHJ1bmNhdGUoMCk7Ci0gICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgcHJldmlv dXNJbmRlbnQ7ICsraSkKLSAgICAgICAgICAgIHByZWZpeCArPSAiICAgICI7Ci0gICAgfQotICAg IAotICAgIHJldHVybiBwcmVmaXg7Ci19Ci0KLXN0YXRpYyB2b2lkIHBhZ2VDYWNoZUxvZyhjb25z dCBTdHJpbmcmIHByZWZpeCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQotewotICAgIExPRyhQYWdl Q2FjaGUsICIlcyVzIiwgcHJlZml4LnV0ZjgoKS5kYXRhKCksIG1lc3NhZ2UudXRmOCgpLmRhdGEo KSk7Ci19Ci0gICAgCi0jZGVmaW5lIFBDTE9HKC4uLikgcGFnZUNhY2hlTG9nKHBhZ2VDYWNoZUxv Z1ByZWZpeChpbmRlbnRMZXZlbCksIG1ha2VTdHJpbmcoX19WQV9BUkdTX18pKQorI2RlZmluZSBQ Q0xPRyguLi4pIExPRyhQYWdlQ2FjaGUsICIlKnMlcyIsIGluZGVudExldmVsKjQsICIiLCBtYWtl U3RyaW5nKF9fVkFfQVJHU19fKSkKICAgICAKIHN0YXRpYyBib29sIGxvZ0NhbkNhY2hlRnJhbWVE ZWNpc2lvbihGcmFtZSogZnJhbWUsIGludCBpbmRlbnRMZXZlbCkKIHsKQEAgLTk3LDIyICs3Nywy NiBAQCBzdGF0aWMgYm9vbCBsb2dDYW5DYWNoZUZyYW1lRGVjaXNpb24oRnJhbWUqIGZyYW1lLCBp bnQgaW5kZW50TGV2ZWwpCiAgICAgCiAgICAgYm9vbCBjYW5ub3RDYWNoZSA9IGZhbHNlOwogICAg IAotICAgIGRvIHsKLSAgICAgICAgaWYgKCFmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVy KCkpIHsKLSAgICAgICAgICAgIFBDTE9HKCIgICAtVGhlcmUgaXMgbm8gRG9jdW1lbnRMb2FkZXIg b2JqZWN0Iik7Ci0gICAgICAgICAgICBjYW5ub3RDYWNoZSA9IHRydWU7Ci0gICAgICAgICAgICBi cmVhazsKLSAgICAgICAgfQorICAgIGlmICghZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRl cigpKSB7CisgICAgICAgIFBDTE9HKCIgICAtVGhlcmUgaXMgbm8gRG9jdW1lbnRMb2FkZXIgb2Jq ZWN0Iik7CisgICAgICAgIGNhbm5vdENhY2hlID0gdHJ1ZTsKKyAgICB9IGVsc2UgewogICAgICAg ICBpZiAoIWZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+bWFpbkRvY3VtZW50RXJy b3IoKS5pc051bGwoKSkgewogICAgICAgICAgICAgUENMT0coIiAgIC1NYWluIGRvY3VtZW50IGhh cyBhbiBlcnJvciIpOwogICAgICAgICAgICAgY2Fubm90Q2FjaGUgPSB0cnVlOwogICAgICAgICB9 CisgICAgICAgIGlmIChmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnN1YnN0aXR1 dGVEYXRhKCkuaXNWYWxpZCgpICYmIGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+ c3Vic3RpdHV0ZURhdGEoKS5mYWlsaW5nVVJMKCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBQ Q0xPRygiICAgLUZyYW1lIGlzIGFuIGVycm9yIHBhZ2UiKTsKKyAgICAgICAgICAgIGNhbm5vdENh Y2hlID0gdHJ1ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5zdWJm cmFtZUxvYWRlcigpLT5jb250YWluc1BsdWdpbnMoKSAmJiAhZnJhbWUtPnBhZ2UoKS0+c2V0dGlu Z3MoKS0+cGFnZUNhY2hlU3VwcG9ydHNQbHVnaW5zKCkpIHsKICAgICAgICAgICAgIFBDTE9HKCIg ICAtRnJhbWUgY29udGFpbnMgcGx1Z2lucyIpOwogICAgICAgICAgICAgY2Fubm90Q2FjaGUgPSB0 cnVlOwogICAgICAgICB9Ci0gICAgICAgIGlmIChmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkucHJv dG9jb2xJcygiaHR0cHMiKSkgewotICAgICAgICAgICAgUENMT0coIiAgIC1GcmFtZSBpcyBIVFRQ UyIpOworICAgICAgICBpZiAoZnJhbWUtPmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXMoImh0 dHBzIikKKyAgICAgICAgICAgICYmIChmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCkt PnJlc3BvbnNlKCkuY2FjaGVDb250cm9sQ29udGFpbnNOb0NhY2hlKCkKKyAgICAgICAgICAgICAg ICB8fCBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNlKCkuY2FjaGVD b250cm9sQ29udGFpbnNOb1N0b3JlKCkpKSB7CisgICAgICAgICAgICBQQ0xPRygiICAgLUZyYW1l IGlzIEhUVFBTLCBhbmQgY2FjaGUgY29udHJvbCBwcm9oaWJpdHMgY2FjaGluZyBvciBzdG9yaW5n Iik7CiAgICAgICAgICAgICBjYW5ub3RDYWNoZSA9IHRydWU7CiAgICAgICAgIH0KICAgICAgICAg aWYgKGZyYW1lLT5kb21XaW5kb3coKSAmJiBmcmFtZS0+ZG9tV2luZG93KCktPmhhc0V2ZW50TGlz dGVuZXJzKGV2ZW50TmFtZXMoKS51bmxvYWRFdmVudCkpIHsKQEAgLTE2Myw3ICsxNDcsNyBAQCBz dGF0aWMgYm9vbCBsb2dDYW5DYWNoZUZyYW1lRGVjaXNpb24oRnJhbWUqIGZyYW1lLCBpbnQgaW5k ZW50TGV2ZWwpCiAgICAgICAgICAgICBQQ0xPRygiICAgLVRoZSBjbGllbnQgc2F5cyB0aGlzIGZy YW1lIGNhbm5vdCBiZSBjYWNoZWQiKTsKICAgICAgICAgICAgIGNhbm5vdENhY2hlID0gdHJ1ZTsg CiAgICAgICAgIH0KLSAgICB9IHdoaWxlIChmYWxzZSk7CisgICAgfQogICAgIAogICAgIGZvciAo RnJhbWUqIGNoaWxkID0gZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQg PSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKQogICAgICAgICBpZiAoIWxvZ0NhbkNhY2hl RnJhbWVEZWNpc2lvbihjaGlsZCwgaW5kZW50TGV2ZWwgKyAxKSkKQEAgLTE4OSw3ICsxNzMsNiBA QCBzdGF0aWMgdm9pZCBsb2dDYW5DYWNoZVBhZ2VEZWNpc2lvbihQYWdlKiBwYWdlKQogICAgIAog ICAgIGJvb2wgY2Fubm90Q2FjaGUgPSAhbG9nQ2FuQ2FjaGVGcmFtZURlY2lzaW9uKHBhZ2UtPm1h aW5GcmFtZSgpLCAxKTsKICAgICAKLSAgICBGcmFtZUxvYWRUeXBlIGxvYWRUeXBlID0gcGFnZS0+ bWFpbkZyYW1lKCktPmxvYWRlcigpLT5sb2FkVHlwZSgpOwogICAgIGlmICghcGFnZS0+YmFja0Zv cndhcmQoKS0+aXNBY3RpdmUoKSkgewogICAgICAgICBQQ0xPRygiICAgLVRoZSBiYWNrL2Zvcndh cmQgbGlzdCBpcyBkaXNhYmxlZCBvciBoYXMgMCBjYXBhY2l0eSIpOwogICAgICAgICBjYW5ub3RD YWNoZSA9IHRydWU7CkBAIC0yMDgsNiArMTkxLDcgQEAgc3RhdGljIHZvaWQgbG9nQ2FuQ2FjaGVQ YWdlRGVjaXNpb24oUGFnZSogcGFnZSkKICAgICAgICAgY2Fubm90Q2FjaGUgPSB0cnVlOwogICAg IH0KICNlbmRpZgorICAgIEZyYW1lTG9hZFR5cGUgbG9hZFR5cGUgPSBwYWdlLT5tYWluRnJhbWUo KS0+bG9hZGVyKCktPmxvYWRUeXBlKCk7CiAgICAgaWYgKGxvYWRUeXBlID09IEZyYW1lTG9hZFR5 cGVSZWxvYWQpIHsKICAgICAgICAgUENMT0coIiAgIC1Mb2FkIHR5cGUgaXM6IFJlbG9hZCIpOwog ICAgICAgICBjYW5ub3RDYWNoZSA9IHRydWU7Cg== 129915 2012-03-02 10:01:47 -0800 2012-03-02 12:11:35 -0800 Patch bug-79943-20120302130146.patch text/plain 4864 gavinp U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzdlMDEwNTIzYjZlZjUx YTIxYjFlYThkOTA0N2FhNWY4NDI0NTViOS4uODE1Y2IxZjhhMmEzZjIzOWM2OWU0YTlhNDM2ODI4 MGY0ZTI4OGZjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAzLTAxICBHYXZp biBQZXRlcnMgIDxnYXZpbnBAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFN5bmMgUGFnZUNhY2hl IGRlYnVnZ2luZyB3aXRoIFBhZ2VDYWNoZSBiZWhhdmlvdXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5OTQzCisKKyAgICAgICAgU3luYyB1cCB0aGUg ZGVidWcgcHJpbnRpbmcgY29kZSBpbiBQYWdlQ2FjaGUgd2l0aCB0aGUgYWN0dWFsIGxvZ2ljLAor ICAgICAgICBhbmQgY2xlYW4gdXAgdGhlIGRlYnVnIHByaW50aW5nIGF0IHRoZSBzYW1lIHRpbWUu CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cywgYXMgdGhpcyBpcyBhIHJlZmFjdG9yIG9mIGRlYnVnIG9ubHkgY29kZS4KKworICAgICAg ICAqIGhpc3RvcnkvUGFnZUNhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAo V2ViQ29yZTo6bG9nQ2FuQ2FjaGVGcmFtZURlY2lzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6Omxv Z0NhbkNhY2hlUGFnZURlY2lzaW9uKToKKwogMjAxMi0wMi0yOSAgRGF2aWQgSHlhdHQgIDxoeWF0 dEBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc5OTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNo ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L1BhZ2VDYWNoZS5jcHAKaW5kZXggYTBkNWRl NGQ5NGY2MDBlN2RkNzc3MWEzNjg5N2JhMzlmNWQzMTk4Yi4uZjI3ZTQxOWVmNWQxYmY5YjAxMWE3 NjUxOWM2YWVmMTlmOWU5ZWI1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9Q YWdlQ2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvUGFnZUNhY2hlLmNwcApA QCAtNTcsMjcgKzU3LDcgQEAgc3RhdGljIGNvbnN0IGRvdWJsZSBhdXRvcmVsZWFzZUludGVydmFs ID0gMzsKIAogI2lmbmRlZiBOREVCVUcKIAotc3RhdGljIFN0cmluZyYgcGFnZUNhY2hlTG9nUHJl Zml4KGludCBpbmRlbnRMZXZlbCkKLXsKLSAgICBzdGF0aWMgaW50IHByZXZpb3VzSW5kZW50ID0g LTE7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIHByZWZpeCwgKCkpOwotICAgIAot ICAgIGlmIChpbmRlbnRMZXZlbCAhPSBwcmV2aW91c0luZGVudCkgeyAgICAKLSAgICAgICAgcHJl dmlvdXNJbmRlbnQgPSBpbmRlbnRMZXZlbDsKLSAgICAgICAgcHJlZml4LnRydW5jYXRlKDApOwot ICAgICAgICBmb3IgKGludCBpID0gMDsgaSA8IHByZXZpb3VzSW5kZW50OyArK2kpCi0gICAgICAg ICAgICBwcmVmaXggKz0gIiAgICAiOwotICAgIH0KLSAgICAKLSAgICByZXR1cm4gcHJlZml4Owot fQotCi1zdGF0aWMgdm9pZCBwYWdlQ2FjaGVMb2coY29uc3QgU3RyaW5nJiBwcmVmaXgsIGNvbnN0 IFN0cmluZyYgbWVzc2FnZSkKLXsKLSAgICBMT0coUGFnZUNhY2hlLCAiJXMlcyIsIHByZWZpeC51 dGY4KCkuZGF0YSgpLCBtZXNzYWdlLnV0ZjgoKS5kYXRhKCkpOwotfQotICAgIAotI2RlZmluZSBQ Q0xPRyguLi4pIHBhZ2VDYWNoZUxvZyhwYWdlQ2FjaGVMb2dQcmVmaXgoaW5kZW50TGV2ZWwpLCBt YWtlU3RyaW5nKF9fVkFfQVJHU19fKSkKKyNkZWZpbmUgUENMT0coLi4uKSBMT0coUGFnZUNhY2hl LCAiJSpzJXMiLCBpbmRlbnRMZXZlbCo0LCAiIiwgbWFrZVN0cmluZyhfX1ZBX0FSR1NfXykudXRm OCgpLmRhdGEoKSkKICAgICAKIHN0YXRpYyBib29sIGxvZ0NhbkNhY2hlRnJhbWVEZWNpc2lvbihG cmFtZSogZnJhbWUsIGludCBpbmRlbnRMZXZlbCkKIHsKQEAgLTk3LDIyICs3NywyNiBAQCBzdGF0 aWMgYm9vbCBsb2dDYW5DYWNoZUZyYW1lRGVjaXNpb24oRnJhbWUqIGZyYW1lLCBpbnQgaW5kZW50 TGV2ZWwpCiAgICAgCiAgICAgYm9vbCBjYW5ub3RDYWNoZSA9IGZhbHNlOwogICAgIAotICAgIGRv IHsKLSAgICAgICAgaWYgKCFmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCkpIHsKLSAg ICAgICAgICAgIFBDTE9HKCIgICAtVGhlcmUgaXMgbm8gRG9jdW1lbnRMb2FkZXIgb2JqZWN0Iik7 Ci0gICAgICAgICAgICBjYW5ub3RDYWNoZSA9IHRydWU7Ci0gICAgICAgICAgICBicmVhazsKLSAg ICAgICAgfQorICAgIGlmICghZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpKSB7Cisg ICAgICAgIFBDTE9HKCIgICAtVGhlcmUgaXMgbm8gRG9jdW1lbnRMb2FkZXIgb2JqZWN0Iik7Cisg ICAgICAgIGNhbm5vdENhY2hlID0gdHJ1ZTsKKyAgICB9IGVsc2UgewogICAgICAgICBpZiAoIWZy YW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+bWFpbkRvY3VtZW50RXJyb3IoKS5pc051 bGwoKSkgewogICAgICAgICAgICAgUENMT0coIiAgIC1NYWluIGRvY3VtZW50IGhhcyBhbiBlcnJv ciIpOwogICAgICAgICAgICAgY2Fubm90Q2FjaGUgPSB0cnVlOwogICAgICAgICB9CisgICAgICAg IGlmIChmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnN1YnN0aXR1dGVEYXRhKCku aXNWYWxpZCgpICYmIGZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+c3Vic3RpdHV0 ZURhdGEoKS5mYWlsaW5nVVJMKCkuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICBQQ0xPRygiICAg LUZyYW1lIGlzIGFuIGVycm9yIHBhZ2UiKTsKKyAgICAgICAgICAgIGNhbm5vdENhY2hlID0gdHJ1 ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5zdWJmcmFtZUxvYWRl cigpLT5jb250YWluc1BsdWdpbnMoKSAmJiAhZnJhbWUtPnBhZ2UoKS0+c2V0dGluZ3MoKS0+cGFn ZUNhY2hlU3VwcG9ydHNQbHVnaW5zKCkpIHsKICAgICAgICAgICAgIFBDTE9HKCIgICAtRnJhbWUg Y29udGFpbnMgcGx1Z2lucyIpOwogICAgICAgICAgICAgY2Fubm90Q2FjaGUgPSB0cnVlOwogICAg ICAgICB9Ci0gICAgICAgIGlmIChmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCkucHJvdG9jb2xJcygi aHR0cHMiKSkgewotICAgICAgICAgICAgUENMT0coIiAgIC1GcmFtZSBpcyBIVFRQUyIpOworICAg ICAgICBpZiAoZnJhbWUtPmRvY3VtZW50KCktPnVybCgpLnByb3RvY29sSXMoImh0dHBzIikKKyAg ICAgICAgICAgICYmIChmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNl KCkuY2FjaGVDb250cm9sQ29udGFpbnNOb0NhY2hlKCkKKyAgICAgICAgICAgICAgICB8fCBmcmFt ZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCktPnJlc3BvbnNlKCkuY2FjaGVDb250cm9sQ29u dGFpbnNOb1N0b3JlKCkpKSB7CisgICAgICAgICAgICBQQ0xPRygiICAgLUZyYW1lIGlzIEhUVFBT LCBhbmQgY2FjaGUgY29udHJvbCBwcm9oaWJpdHMgY2FjaGluZyBvciBzdG9yaW5nIik7CiAgICAg ICAgICAgICBjYW5ub3RDYWNoZSA9IHRydWU7CiAgICAgICAgIH0KICAgICAgICAgaWYgKGZyYW1l LT5kb21XaW5kb3coKSAmJiBmcmFtZS0+ZG9tV2luZG93KCktPmhhc0V2ZW50TGlzdGVuZXJzKGV2 ZW50TmFtZXMoKS51bmxvYWRFdmVudCkpIHsKQEAgLTE2Myw3ICsxNDcsNyBAQCBzdGF0aWMgYm9v bCBsb2dDYW5DYWNoZUZyYW1lRGVjaXNpb24oRnJhbWUqIGZyYW1lLCBpbnQgaW5kZW50TGV2ZWwp CiAgICAgICAgICAgICBQQ0xPRygiICAgLVRoZSBjbGllbnQgc2F5cyB0aGlzIGZyYW1lIGNhbm5v dCBiZSBjYWNoZWQiKTsKICAgICAgICAgICAgIGNhbm5vdENhY2hlID0gdHJ1ZTsgCiAgICAgICAg IH0KLSAgICB9IHdoaWxlIChmYWxzZSk7CisgICAgfQogICAgIAogICAgIGZvciAoRnJhbWUqIGNo aWxkID0gZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+ dHJlZSgpLT5uZXh0U2libGluZygpKQogICAgICAgICBpZiAoIWxvZ0NhbkNhY2hlRnJhbWVEZWNp c2lvbihjaGlsZCwgaW5kZW50TGV2ZWwgKyAxKSkKQEAgLTE4OSw3ICsxNzMsNiBAQCBzdGF0aWMg dm9pZCBsb2dDYW5DYWNoZVBhZ2VEZWNpc2lvbihQYWdlKiBwYWdlKQogICAgIAogICAgIGJvb2wg Y2Fubm90Q2FjaGUgPSAhbG9nQ2FuQ2FjaGVGcmFtZURlY2lzaW9uKHBhZ2UtPm1haW5GcmFtZSgp LCAxKTsKICAgICAKLSAgICBGcmFtZUxvYWRUeXBlIGxvYWRUeXBlID0gcGFnZS0+bWFpbkZyYW1l KCktPmxvYWRlcigpLT5sb2FkVHlwZSgpOwogICAgIGlmICghcGFnZS0+YmFja0ZvcndhcmQoKS0+ aXNBY3RpdmUoKSkgewogICAgICAgICBQQ0xPRygiICAgLVRoZSBiYWNrL2ZvcndhcmQgbGlzdCBp cyBkaXNhYmxlZCBvciBoYXMgMCBjYXBhY2l0eSIpOwogICAgICAgICBjYW5ub3RDYWNoZSA9IHRy dWU7CkBAIC0yMDgsNiArMTkxLDcgQEAgc3RhdGljIHZvaWQgbG9nQ2FuQ2FjaGVQYWdlRGVjaXNp b24oUGFnZSogcGFnZSkKICAgICAgICAgY2Fubm90Q2FjaGUgPSB0cnVlOwogICAgIH0KICNlbmRp ZgorICAgIEZyYW1lTG9hZFR5cGUgbG9hZFR5cGUgPSBwYWdlLT5tYWluRnJhbWUoKS0+bG9hZGVy KCktPmxvYWRUeXBlKCk7CiAgICAgaWYgKGxvYWRUeXBlID09IEZyYW1lTG9hZFR5cGVSZWxvYWQp IHsKICAgICAgICAgUENMT0coIiAgIC1Mb2FkIHR5cGUgaXM6IFJlbG9hZCIpOwogICAgICAgICBj YW5ub3RDYWNoZSA9IHRydWU7Cg==