40572 2010-06-14 08:01:01 -0700 [Qt] Stack overflow when converting navigator object to QVariant 2010-08-03 05:10:02 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 35784 1 kling webkit-qt-unassigned commit-queue hausmann ryukbk oldest_to_newest 237822 0 kling 2010-06-14 08:01:01 -0700 The navigator object is infinitely recursive thanks to MimeType and Plugin. When converting it from a JSValue to a QVariant, we crash due to stack overflow. 237825 1 58649 kling 2010-06-14 08:02:16 -0700 Created attachment 58649 Proposed patch 237830 2 58653 kling 2010-06-14 08:14:42 -0700 Created attachment 58653 Proposed patch v2 Lowered recursion limit to 200 (40000 was too big for default ulimit -s value on Linux.) 237866 3 58653 commit-queue 2010-06-14 09:38:29 -0700 Comment on attachment 58653 Proposed patch v2 Clearing flags on attachment: 58653 Committed r61127: <http://trac.webkit.org/changeset/61127> 237867 4 commit-queue 2010-06-14 09:38:34 -0700 All reviewed patches have been landed. Closing bug. 248419 5 kling 2010-07-08 12:15:09 -0700 *** Bug 41750 has been marked as a duplicate of this bug. *** 259383 6 hausmann 2010-08-03 05:10:02 -0700 Revision r61127 cherry-picked into qtwebkit-2.0 with commit d6aa024c84f61d0602bef4eef84efaed7cfeefcc 58649 2010-06-14 08:02:16 -0700 2010-06-14 08:14:42 -0700 Proposed patch bug-40572.diff text/plain 9464 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjM5Y2RhNi4uNzMwN2NiNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNi0xNCAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gU3RhY2sgb3ZlcmZsb3cgd2hlbiBjb252ZXJ0aW5n IG5hdmlnYXRvciBvYmplY3QgdG8gUVZhcmlhbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNTcyCisKKyAgICAgICAgUHJvdGVjdCBhZ2FpbnN0IGlu ZmluaXRlIHJlY3Vyc2lvbiBpbiBKU1ZhbHVlLT5RVmFyaWFudCBjb252ZXJzaW9uLgorICAgICAg ICBUaGlzIGZpeGVzIGEgY3Jhc2ggd2hlbiB0cnlpbmcgdG8gY29udmVydCBNaW1lVHlwZSBvYmpl Y3RzICh0aGV5CisgICAgICAgIHJlY3Vyc2UgaW5maW5pdGVseSBhbmQgb24tdGhlLWZseSB2aWEg dGhlIGVuYWJsZWRQbHVnaW4gcHJvcGVydHkuKQorCisgICAgICAgICogYnJpZGdlL3F0L3F0X3J1 bnRpbWUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Y29udmVydFZhbHVlVG9RVmFyaWFu dCk6CisKIDIwMTAtMDYtMTMgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFpbC5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jy aWRnZS9xdC9xdF9ydW50aW1lLmNwcCBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3Bw CmluZGV4IDZjZWE5NmUuLjQzYTBmMGIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0 X3J1bnRpbWUuY3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCkBAIC0x NjIsOSArMTYyLDkgQEAgc3RhdGljIEpTUmVhbFR5cGUgdmFsdWVSZWFsVHlwZShFeGVjU3RhdGUq IGV4ZWMsIEpTVmFsdWUgdmFsKQogICAgIHJldHVybiBTdHJpbmc7IC8vIEkgZG9uJ3Qga25vdy4K IH0KIAotUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFyaWFudChFeGVjU3RhdGUqIGV4ZWMsIEpT VmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6VHlwZSBoaW50LCBpbnQgKmRpc3RhbmNlLCBIYXNoU2V0 PEpTT2JqZWN0Kj4qIHZpc2l0ZWRPYmplY3RzKQorUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFy aWFudChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6VHlwZSBoaW50 LCBpbnQgKmRpc3RhbmNlLCBIYXNoU2V0PEpTT2JqZWN0Kj4qIHZpc2l0ZWRPYmplY3RzLCBpbnQg cmVjdXJzaW9uTGltaXQpCiB7Ci0gICAgaWYgKCF2YWx1ZSkKKyAgICBpZiAoIXZhbHVlIHx8ICFy ZWN1cnNpb25MaW1pdCkKICAgICAgICAgcmV0dXJuIFFWYXJpYW50KCk7CiAKICAgICBKU09iamVj dCogb2JqZWN0ID0gMDsKQEAgLTM0NCw3ICszNDQsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVU b1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBl CiAgICAgICAgICAgICAgICAgd2hpbGUoaXQgIT0gcHJvcGVydGllcy5lbmQoKSkgewogICAgICAg ICAgICAgICAgICAgICBpZiAob2JqZWN0LT5wcm9wZXJ0eUlzRW51bWVyYWJsZShleGVjLCAqaXQp KSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBKU1ZhbHVlIHZhbCA9IG9iamVjdC0+Z2V0KGV4 ZWMsICppdCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBRVmFyaWFudCB2ID0gY29udmVydFZh bHVlVG9RVmFyaWFudChleGVjLCB2YWwsIFFNZXRhVHlwZTo6Vm9pZCwgJm9iamRpc3QsIHZpc2l0 ZWRPYmplY3RzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFFWYXJpYW50IHYgPSBjb252ZXJ0 VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpWb2lkLCAmb2JqZGlzdCwgdmlz aXRlZE9iamVjdHMsIHJlY3Vyc2lvbkxpbWl0IC0gMSk7CiAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAob2JqZGlzdCA+PSAwKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVVN0cmlu ZyB1c3RyaW5nID0gKCppdCkudXN0cmluZygpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg IFFTdHJpbmcgaWQgPSBRU3RyaW5nKChjb25zdCBRQ2hhciopdXN0cmluZy5yZXAoKS0+Y2hhcmFj dGVycygpLCB1c3RyaW5nLnNpemUoKSk7CkBAIC0zNjgsNyArMzY4LDcgQEAgUVZhcmlhbnQgY29u dmVydFZhbHVlVG9RVmFyaWFudChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRh VHlwZTo6VHlwZQogICAgICAgICAgICAgICAgIHFDb252RGVidWcoKSA8PCAiY29udmVydGluZyBh ICIgPDwgbGVuIDw8ICIgbGVuZ3RoIEFycmF5IjsKICAgICAgICAgICAgICAgICBmb3IgKGludCBp ID0gMDsgaSA8IGxlbjsgKytpKSB7CiAgICAgICAgICAgICAgICAgICAgIEpTVmFsdWUgdmFsID0g cnRhcnJheS0+Z2V0Q29uY3JldGVBcnJheSgpLT52YWx1ZUF0KGV4ZWMsIGkpOwotICAgICAgICAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kKGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFs LCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2JqZWN0cykpOworICAgICAgICAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kKGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFs LCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2JqZWN0cywgcmVjdXJzaW9uTGlt aXQgLSAxKSk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChvYmpkaXN0ID09IC0xKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICBxQ29udkRlYnVnKCkgPDwgIkZhaWxlZCBjb252ZXJ0aW5nIGVs ZW1lbnQgYXQgaW5kZXggIiA8PCBpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7IC8v IEZhaWxlZCBjb252ZXJ0aW5nIGEgbGlzdCBlbnRyeSwgc28gZmFpbCB0aGUgYXJyYXkKQEAgLTM4 Nyw3ICszODcsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4ZWNTdGF0ZSog ZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAgICAgICAgICAgcUNv bnZEZWJ1ZygpIDw8ICJjb252ZXJ0aW5nIGEgIiA8PCBsZW4gPDwgIiBsZW5ndGggQXJyYXkiOwog ICAgICAgICAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbGVuOyArK2kpIHsKICAgICAgICAg ICAgICAgICAgICAgSlNWYWx1ZSB2YWwgPSBhcnJheS0+Z2V0KGV4ZWMsIGkpOwotICAgICAgICAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kKGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFs LCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2JqZWN0cykpOworICAgICAgICAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kKGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFs LCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2JqZWN0cywgcmVjdXJzaW9uTGlt aXQgLSAxKSk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChvYmpkaXN0ID09IC0xKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICBxQ29udkRlYnVnKCkgPDwgIkZhaWxlZCBjb252ZXJ0aW5nIGVs ZW1lbnQgYXQgaW5kZXggIiA8PCBpOwogICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7IC8v IEZhaWxlZCBjb252ZXJ0aW5nIGEgbGlzdCBlbnRyeSwgc28gZmFpbCB0aGUgYXJyYXkKQEAgLTQw MSw3ICs0MDEsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4ZWNTdGF0ZSog ZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAgICAgICAgICAgLy8g TWFrZSBhIHNpbmdsZSBsZW5ndGggYXJyYXkKICAgICAgICAgICAgICAgICBpbnQgb2JqZGlzdDsK ICAgICAgICAgICAgICAgICBxQ29udkRlYnVnKCkgPDwgIm1ha2luZyBhIHNpbmdsZSBsZW5ndGgg dmFyaWFudGxpc3QiOwotICAgICAgICAgICAgICAgIFFWYXJpYW50IHZhciA9IGNvbnZlcnRWYWx1 ZVRvUVZhcmlhbnQoZXhlYywgdmFsdWUsIFFNZXRhVHlwZTo6Vm9pZCwgJm9iamRpc3QsIHZpc2l0 ZWRPYmplY3RzKTsKKyAgICAgICAgICAgICAgICBRVmFyaWFudCB2YXIgPSBjb252ZXJ0VmFsdWVU b1FWYXJpYW50KGV4ZWMsIHZhbHVlLCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVk T2JqZWN0cywgcmVjdXJzaW9uTGltaXQgLSAxKTsKICAgICAgICAgICAgICAgICBpZiAob2JqZGlz dCAhPSAtMSkgewogICAgICAgICAgICAgICAgICAgICBRVmFyaWFudExpc3QgcmVzdWx0OwogICAg ICAgICAgICAgICAgICAgICByZXN1bHQgPDwgdmFyOwpAQCAtNjQ1LDcgKzY0NSw3IEBAIFFWYXJp YW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVl LCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkg PCBsZW47ICsraSkgewogICAgICAgICAgICAgICAgICAgICAgICAgSlNWYWx1ZSB2YWwgPSBydGFy cmF5LT5nZXRDb25jcmV0ZUFycmF5KCktPnZhbHVlQXQoZXhlYywgaSk7CiAgICAgICAgICAgICAg ICAgICAgICAgICBpbnQgaXRlbWRpc3QgPSAtMTsKLSAgICAgICAgICAgICAgICAgICAgICAgIFFW YXJpYW50IGl0ZW0gPSBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbCwgUU1ldGFUeXBl OjpRT2JqZWN0U3RhciwgJml0ZW1kaXN0LCB2aXNpdGVkT2JqZWN0cyk7CisgICAgICAgICAgICAg ICAgICAgICAgICBRVmFyaWFudCBpdGVtID0gY29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2 YWwsIFFNZXRhVHlwZTo6UU9iamVjdFN0YXIsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMsIHJl Y3Vyc2lvbkxpbWl0IC0gMSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaXRlbWRpc3Qg Pj0gMCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGl0ZW0udmFs dWU8UU9iamVjdCo+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQpAQCAtNjY0LDcg KzY2NCw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVj LCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAgICAgZm9y IChpbnQgaSA9IDA7IGkgPCBsZW47ICsraSkgewogICAgICAgICAgICAgICAgICAgICAgICAgSlNW YWx1ZSB2YWwgPSBhcnJheS0+Z2V0KGV4ZWMsIGkpOwogICAgICAgICAgICAgICAgICAgICAgICAg aW50IGl0ZW1kaXN0ID0gLTE7Ci0gICAgICAgICAgICAgICAgICAgICAgICBRVmFyaWFudCBpdGVt ID0gY29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWwsIFFNZXRhVHlwZTo6UU9iamVjdFN0 YXIsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMpOworICAgICAgICAgICAgICAgICAgICAgICAg UVZhcmlhbnQgaXRlbSA9IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFsLCBRTWV0YVR5 cGU6OlFPYmplY3RTdGFyLCAmaXRlbWRpc3QsIHZpc2l0ZWRPYmplY3RzLCByZWN1cnNpb25MaW1p dCAtIDEpOwogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGl0ZW1kaXN0ID49IDApCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChpdGVtLnZhbHVlPFFPYmplY3Qq PigpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKQEAgLTY3OSw3ICs2NzksNyBAQCBR VmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2 YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAgICAgICAgICAgICAgIC8vIE1ha2UgYSBzaW5n bGUgbGVuZ3RoIGFycmF5CiAgICAgICAgICAgICAgICAgICAgIFFPYmplY3RMaXN0IHJlc3VsdDsK ICAgICAgICAgICAgICAgICAgICAgaW50IGl0ZW1kaXN0ID0gLTE7Ci0gICAgICAgICAgICAgICAg ICAgIFFWYXJpYW50IGl0ZW0gPSBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbHVlLCBR TWV0YVR5cGU6OlFPYmplY3RTdGFyLCAmaXRlbWRpc3QsIHZpc2l0ZWRPYmplY3RzKTsKKyAgICAg ICAgICAgICAgICAgICAgUVZhcmlhbnQgaXRlbSA9IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhl YywgdmFsdWUsIFFNZXRhVHlwZTo6UU9iamVjdFN0YXIsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVj dHMsIHJlY3Vyc2lvbkxpbWl0IC0gMSk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChpdGVtZGlz dCA+PSAwKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGl0ZW0udmFs dWU8UU9iamVjdCo+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZGlzdCA9IDEwOwpAQCAt Njk2LDcgKzY5Niw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRl KiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAg ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW47ICsraSkgewogICAgICAgICAgICAgICAgICAgICAg ICAgSlNWYWx1ZSB2YWwgPSBydGFycmF5LT5nZXRDb25jcmV0ZUFycmF5KCktPnZhbHVlQXQoZXhl YywgaSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgaXRlbWRpc3QgPSAtMTsKLSAgICAg ICAgICAgICAgICAgICAgICAgIFFWYXJpYW50IGl0ZW0gPSBjb252ZXJ0VmFsdWVUb1FWYXJpYW50 KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpJbnQsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMpOwor ICAgICAgICAgICAgICAgICAgICAgICAgUVZhcmlhbnQgaXRlbSA9IGNvbnZlcnRWYWx1ZVRvUVZh cmlhbnQoZXhlYywgdmFsLCBRTWV0YVR5cGU6OkludCwgJml0ZW1kaXN0LCB2aXNpdGVkT2JqZWN0 cywgcmVjdXJzaW9uTGltaXQgLSAxKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChpdGVt ZGlzdCA+PSAwKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoaXRl bS52YWx1ZTxpbnQ+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQpAQCAtNzE1LDcg KzcxNSw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVj LCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAgICAgZm9y IChpbnQgaSA9IDA7IGkgPCBsZW47ICsraSkgewogICAgICAgICAgICAgICAgICAgICAgICAgSlNW YWx1ZSB2YWwgPSBhcnJheS0+Z2V0KGV4ZWMsIGkpOwogICAgICAgICAgICAgICAgICAgICAgICAg aW50IGl0ZW1kaXN0ID0gLTE7Ci0gICAgICAgICAgICAgICAgICAgICAgICBRVmFyaWFudCBpdGVt ID0gY29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWwsIFFNZXRhVHlwZTo6SW50LCAmaXRl bWRpc3QsIHZpc2l0ZWRPYmplY3RzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFFWYXJpYW50 IGl0ZW0gPSBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpJbnQs ICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMsIHJlY3Vyc2lvbkxpbWl0IC0gMSk7CiAgICAgICAg ICAgICAgICAgICAgICAgICBpZiAoaXRlbWRpc3QgPj0gMCkKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZXN1bHQuYXBwZW5kKGl0ZW0udmFsdWU8aW50PigpKTsKICAgICAgICAgICAgICAg ICAgICAgICAgIGVsc2UKQEAgLTczMCw3ICs3MzAsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVU b1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBl CiAgICAgICAgICAgICAgICAgICAgIC8vIE1ha2UgYSBzaW5nbGUgbGVuZ3RoIGFycmF5CiAgICAg ICAgICAgICAgICAgICAgIFFMaXN0PGludD4gcmVzdWx0OwogICAgICAgICAgICAgICAgICAgICBp bnQgaXRlbWRpc3QgPSAtMTsKLSAgICAgICAgICAgICAgICAgICAgUVZhcmlhbnQgaXRlbSA9IGNv bnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFsdWUsIFFNZXRhVHlwZTo6SW50LCAmaXRlbWRp c3QsIHZpc2l0ZWRPYmplY3RzKTsKKyAgICAgICAgICAgICAgICAgICAgUVZhcmlhbnQgaXRlbSA9 IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFsdWUsIFFNZXRhVHlwZTo6SW50LCAmaXRl bWRpc3QsIHZpc2l0ZWRPYmplY3RzLCByZWN1cnNpb25MaW1pdCAtIDEpOwogICAgICAgICAgICAg ICAgICAgICBpZiAoaXRlbWRpc3QgPj0gMCkgewogICAgICAgICAgICAgICAgICAgICAgICAgcmVz dWx0LmFwcGVuZChpdGVtLnZhbHVlPGludD4oKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICBk aXN0ID0gMTA7CkBAIC03NTcsNyArNzU3LDcgQEAgUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFy aWFudChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6VHlwZQogICAg ICAgICAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgICAgICAgICAgLy8gQW5kIHRoZW4gcmVj dXJzZSB3aXRoIHRoZSBhdXRvZGV0ZWN0IGZsYWcKLSAgICAgICAgICAgICAgICAgICAgcmV0ID0g Y29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWx1ZSwgUU1ldGFUeXBlOjpWb2lkLCBkaXN0 YW5jZSwgdmlzaXRlZE9iamVjdHMpOworICAgICAgICAgICAgICAgICAgICByZXQgPSBjb252ZXJ0 VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbHVlLCBRTWV0YVR5cGU6OlZvaWQsIGRpc3RhbmNlLCB2 aXNpdGVkT2JqZWN0cywgcmVjdXJzaW9uTGltaXQgLSAxKTsKICAgICAgICAgICAgICAgICAgICAg ZGlzdCA9IDEwOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBicmVhazsKQEAg LTc3Nyw4ICs3NzcsMTAgQEAgUVZhcmlhbnQgY29udmVydFZhbHVlVG9RVmFyaWFudChFeGVjU3Rh dGUqIGV4ZWMsIEpTVmFsdWUgdmFsdWUsIFFNZXRhVHlwZTo6VHlwZQogCiBRVmFyaWFudCBjb252 ZXJ0VmFsdWVUb1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFU eXBlOjpUeXBlIGhpbnQsIGludCAqZGlzdGFuY2UpCiB7CisgICAgLy8gVXNlIHRoZSBzYW1lIHJl Y3Vyc2lvbiBsaW1pdCBhcyBKU0MncyBKU09OT2JqZWN0CisgICAgY29uc3QgaW50IHJlY3Vyc2lv bkxpbWl0ID0gNDAwMDA7CiAgICAgSGFzaFNldDxKU09iamVjdCo+IHZpc2l0ZWRPYmplY3RzOwot ICAgIHJldHVybiBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbHVlLCBoaW50LCBkaXN0 YW5jZSwgJnZpc2l0ZWRPYmplY3RzKTsKKyAgICByZXR1cm4gY29udmVydFZhbHVlVG9RVmFyaWFu dChleGVjLCB2YWx1ZSwgaGludCwgZGlzdGFuY2UsICZ2aXNpdGVkT2JqZWN0cywgcmVjdXJzaW9u TGltaXQpOwogfQogCiBKU1ZhbHVlIGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoRXhlY1N0YXRlKiBl eGVjLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+IHJvb3QsIGNvbnN0IFFWYXJpYW50JiB2YXJpYW50 KQo= 58653 2010-06-14 08:14:42 -0700 2010-06-14 09:38:28 -0700 Proposed patch v2 bug-40572-v2.diff text/plain 9386 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MjM5Y2RhNi4uNzMwN2NiNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNi0xNCAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gU3RhY2sgb3ZlcmZsb3cgd2hlbiBjb252ZXJ0aW5n IG5hdmlnYXRvciBvYmplY3QgdG8gUVZhcmlhbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQwNTcyCisKKyAgICAgICAgUHJvdGVjdCBhZ2FpbnN0IGlu ZmluaXRlIHJlY3Vyc2lvbiBpbiBKU1ZhbHVlLT5RVmFyaWFudCBjb252ZXJzaW9uLgorICAgICAg ICBUaGlzIGZpeGVzIGEgY3Jhc2ggd2hlbiB0cnlpbmcgdG8gY29udmVydCBNaW1lVHlwZSBvYmpl Y3RzICh0aGV5CisgICAgICAgIHJlY3Vyc2UgaW5maW5pdGVseSBhbmQgb24tdGhlLWZseSB2aWEg dGhlIGVuYWJsZWRQbHVnaW4gcHJvcGVydHkuKQorCisgICAgICAgICogYnJpZGdlL3F0L3F0X3J1 bnRpbWUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Y29udmVydFZhbHVlVG9RVmFyaWFu dCk6CisKIDIwMTAtMDYtMTMgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFpbC5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Jy aWRnZS9xdC9xdF9ydW50aW1lLmNwcCBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3Bw CmluZGV4IDZjZWE5NmUuLjhjYmQyODIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvYnJpZGdlL3F0L3F0 X3J1bnRpbWUuY3BwCisrKyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X3J1bnRpbWUuY3BwCkBAIC0x NjIsOSArMTYyLDExIEBAIHN0YXRpYyBKU1JlYWxUeXBlIHZhbHVlUmVhbFR5cGUoRXhlY1N0YXRl KiBleGVjLCBKU1ZhbHVlIHZhbCkKICAgICByZXR1cm4gU3RyaW5nOyAvLyBJIGRvbid0IGtub3cu CiB9CiAKLVFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBK U1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUgaGludCwgaW50ICpkaXN0YW5jZSwgSGFzaFNl dDxKU09iamVjdCo+KiB2aXNpdGVkT2JqZWN0cykKK1FWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZh cmlhbnQoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUgaGlu dCwgaW50ICpkaXN0YW5jZSwgSGFzaFNldDxKU09iamVjdCo+KiB2aXNpdGVkT2JqZWN0cywgaW50 IHJlY3Vyc2lvbkxpbWl0KQogewotICAgIGlmICghdmFsdWUpCisgICAgLS1yZWN1cnNpb25MaW1p dDsKKworICAgIGlmICghdmFsdWUgfHwgIXJlY3Vyc2lvbkxpbWl0KQogICAgICAgICByZXR1cm4g UVZhcmlhbnQoKTsKIAogICAgIEpTT2JqZWN0KiBvYmplY3QgPSAwOwpAQCAtMzQ0LDcgKzM0Niw3 IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBKU1Zh bHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICB3aGlsZShpdCAhPSBw cm9wZXJ0aWVzLmVuZCgpKSB7CiAgICAgICAgICAgICAgICAgICAgIGlmIChvYmplY3QtPnByb3Bl cnR5SXNFbnVtZXJhYmxlKGV4ZWMsICppdCkpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIEpT VmFsdWUgdmFsID0gb2JqZWN0LT5nZXQoZXhlYywgKml0KTsKLSAgICAgICAgICAgICAgICAgICAg ICAgIFFWYXJpYW50IHYgPSBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbCwgUU1ldGFU eXBlOjpWb2lkLCAmb2JqZGlzdCwgdmlzaXRlZE9iamVjdHMpOworICAgICAgICAgICAgICAgICAg ICAgICAgUVZhcmlhbnQgdiA9IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFsLCBRTWV0 YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2JqZWN0cywgcmVjdXJzaW9uTGltaXQpOwog ICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG9iamRpc3QgPj0gMCkgewogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFVTdHJpbmcgdXN0cmluZyA9ICgqaXQpLnVzdHJpbmcoKTsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBRU3RyaW5nIGlkID0gUVN0cmluZygoY29uc3QgUUNoYXIq KXVzdHJpbmcucmVwKCktPmNoYXJhY3RlcnMoKSwgdXN0cmluZy5zaXplKCkpOwpAQCAtMzY4LDcg KzM3MCw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVj LCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICBxQ29udkRl YnVnKCkgPDwgImNvbnZlcnRpbmcgYSAiIDw8IGxlbiA8PCAiIGxlbmd0aCBBcnJheSI7CiAgICAg ICAgICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW47ICsraSkgewogICAgICAgICAgICAg ICAgICAgICBKU1ZhbHVlIHZhbCA9IHJ0YXJyYXktPmdldENvbmNyZXRlQXJyYXkoKS0+dmFsdWVB dChleGVjLCBpKTsKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChjb252ZXJ0VmFs dWVUb1FWYXJpYW50KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpWb2lkLCAmb2JqZGlzdCwgdmlzaXRl ZE9iamVjdHMpKTsKKyAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChjb252ZXJ0VmFs dWVUb1FWYXJpYW50KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpWb2lkLCAmb2JqZGlzdCwgdmlzaXRl ZE9iamVjdHMsIHJlY3Vyc2lvbkxpbWl0KSk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChvYmpk aXN0ID09IC0xKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICBxQ29udkRlYnVnKCkgPDwgIkZh aWxlZCBjb252ZXJ0aW5nIGVsZW1lbnQgYXQgaW5kZXggIiA8PCBpOwogICAgICAgICAgICAgICAg ICAgICAgICAgYnJlYWs7IC8vIEZhaWxlZCBjb252ZXJ0aW5nIGEgbGlzdCBlbnRyeSwgc28gZmFp bCB0aGUgYXJyYXkKQEAgLTM4Nyw3ICszODksNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FW YXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAg ICAgICAgICAgICAgICAgcUNvbnZEZWJ1ZygpIDw8ICJjb252ZXJ0aW5nIGEgIiA8PCBsZW4gPDwg IiBsZW5ndGggQXJyYXkiOwogICAgICAgICAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbGVu OyArK2kpIHsKICAgICAgICAgICAgICAgICAgICAgSlNWYWx1ZSB2YWwgPSBhcnJheS0+Z2V0KGV4 ZWMsIGkpOwotICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGNvbnZlcnRWYWx1ZVRv UVZhcmlhbnQoZXhlYywgdmFsLCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2Jq ZWN0cykpOworICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGNvbnZlcnRWYWx1ZVRv UVZhcmlhbnQoZXhlYywgdmFsLCBRTWV0YVR5cGU6OlZvaWQsICZvYmpkaXN0LCB2aXNpdGVkT2Jq ZWN0cywgcmVjdXJzaW9uTGltaXQpKTsKICAgICAgICAgICAgICAgICAgICAgaWYgKG9iamRpc3Qg PT0gLTEpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHFDb252RGVidWcoKSA8PCAiRmFpbGVk IGNvbnZlcnRpbmcgZWxlbWVudCBhdCBpbmRleCAiIDw8IGk7CiAgICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsgLy8gRmFpbGVkIGNvbnZlcnRpbmcgYSBsaXN0IGVudHJ5LCBzbyBmYWlsIHRo ZSBhcnJheQpAQCAtNDAxLDcgKzQwMyw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlh bnQoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAg ICAgICAgICAgICAvLyBNYWtlIGEgc2luZ2xlIGxlbmd0aCBhcnJheQogICAgICAgICAgICAgICAg IGludCBvYmpkaXN0OwogICAgICAgICAgICAgICAgIHFDb252RGVidWcoKSA8PCAibWFraW5nIGEg c2luZ2xlIGxlbmd0aCB2YXJpYW50bGlzdCI7Ci0gICAgICAgICAgICAgICAgUVZhcmlhbnQgdmFy ID0gY29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWx1ZSwgUU1ldGFUeXBlOjpWb2lkLCAm b2JqZGlzdCwgdmlzaXRlZE9iamVjdHMpOworICAgICAgICAgICAgICAgIFFWYXJpYW50IHZhciA9 IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFsdWUsIFFNZXRhVHlwZTo6Vm9pZCwgJm9i amRpc3QsIHZpc2l0ZWRPYmplY3RzLCByZWN1cnNpb25MaW1pdCk7CiAgICAgICAgICAgICAgICAg aWYgKG9iamRpc3QgIT0gLTEpIHsKICAgICAgICAgICAgICAgICAgICAgUVZhcmlhbnRMaXN0IHJl c3VsdDsKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0IDw8IHZhcjsKQEAgLTY0NSw3ICs2NDcs NyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNW YWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAgICAgICAgICAgICAgIGZvciAoaW50 IGkgPSAwOyBpIDwgbGVuOyArK2kpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIEpTVmFsdWUg dmFsID0gcnRhcnJheS0+Z2V0Q29uY3JldGVBcnJheSgpLT52YWx1ZUF0KGV4ZWMsIGkpOwogICAg ICAgICAgICAgICAgICAgICAgICAgaW50IGl0ZW1kaXN0ID0gLTE7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBRVmFyaWFudCBpdGVtID0gY29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWws IFFNZXRhVHlwZTo6UU9iamVjdFN0YXIsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMpOworICAg ICAgICAgICAgICAgICAgICAgICAgUVZhcmlhbnQgaXRlbSA9IGNvbnZlcnRWYWx1ZVRvUVZhcmlh bnQoZXhlYywgdmFsLCBRTWV0YVR5cGU6OlFPYmplY3RTdGFyLCAmaXRlbWRpc3QsIHZpc2l0ZWRP YmplY3RzLCByZWN1cnNpb25MaW1pdCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaXRl bWRpc3QgPj0gMCkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGl0 ZW0udmFsdWU8UU9iamVjdCo+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQpAQCAt NjY0LDcgKzY2Niw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRl KiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAg ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW47ICsraSkgewogICAgICAgICAgICAgICAgICAgICAg ICAgSlNWYWx1ZSB2YWwgPSBhcnJheS0+Z2V0KGV4ZWMsIGkpOwogICAgICAgICAgICAgICAgICAg ICAgICAgaW50IGl0ZW1kaXN0ID0gLTE7Ci0gICAgICAgICAgICAgICAgICAgICAgICBRVmFyaWFu dCBpdGVtID0gY29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWwsIFFNZXRhVHlwZTo6UU9i amVjdFN0YXIsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMpOworICAgICAgICAgICAgICAgICAg ICAgICAgUVZhcmlhbnQgaXRlbSA9IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFsLCBR TWV0YVR5cGU6OlFPYmplY3RTdGFyLCAmaXRlbWRpc3QsIHZpc2l0ZWRPYmplY3RzLCByZWN1cnNp b25MaW1pdCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoaXRlbWRpc3QgPj0gMCkKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKGl0ZW0udmFsdWU8UU9iamVj dCo+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQpAQCAtNjc5LDcgKzY4MSw3IEBA IFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVl IHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAgICAgLy8gTWFrZSBhIHNp bmdsZSBsZW5ndGggYXJyYXkKICAgICAgICAgICAgICAgICAgICAgUU9iamVjdExpc3QgcmVzdWx0 OwogICAgICAgICAgICAgICAgICAgICBpbnQgaXRlbWRpc3QgPSAtMTsKLSAgICAgICAgICAgICAg ICAgICAgUVZhcmlhbnQgaXRlbSA9IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoZXhlYywgdmFsdWUs IFFNZXRhVHlwZTo6UU9iamVjdFN0YXIsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMpOworICAg ICAgICAgICAgICAgICAgICBRVmFyaWFudCBpdGVtID0gY29udmVydFZhbHVlVG9RVmFyaWFudChl eGVjLCB2YWx1ZSwgUU1ldGFUeXBlOjpRT2JqZWN0U3RhciwgJml0ZW1kaXN0LCB2aXNpdGVkT2Jq ZWN0cywgcmVjdXJzaW9uTGltaXQpOwogICAgICAgICAgICAgICAgICAgICBpZiAoaXRlbWRpc3Qg Pj0gMCkgewogICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChpdGVtLnZhbHVl PFFPYmplY3QqPigpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGRpc3QgPSAxMDsKQEAgLTY5 Niw3ICs2OTgsNyBAQCBRVmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4ZWNTdGF0ZSog ZXhlYywgSlNWYWx1ZSB2YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAgICAgICAgICAgICAgICAgICAg IGZvciAoaW50IGkgPSAwOyBpIDwgbGVuOyArK2kpIHsKICAgICAgICAgICAgICAgICAgICAgICAg IEpTVmFsdWUgdmFsID0gcnRhcnJheS0+Z2V0Q29uY3JldGVBcnJheSgpLT52YWx1ZUF0KGV4ZWMs IGkpOwogICAgICAgICAgICAgICAgICAgICAgICAgaW50IGl0ZW1kaXN0ID0gLTE7Ci0gICAgICAg ICAgICAgICAgICAgICAgICBRVmFyaWFudCBpdGVtID0gY29udmVydFZhbHVlVG9RVmFyaWFudChl eGVjLCB2YWwsIFFNZXRhVHlwZTo6SW50LCAmaXRlbWRpc3QsIHZpc2l0ZWRPYmplY3RzKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIFFWYXJpYW50IGl0ZW0gPSBjb252ZXJ0VmFsdWVUb1FWYXJp YW50KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpJbnQsICZpdGVtZGlzdCwgdmlzaXRlZE9iamVjdHMs IHJlY3Vyc2lvbkxpbWl0KTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChpdGVtZGlzdCA+ PSAwKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoaXRlbS52YWx1 ZTxpbnQ+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZWxzZQpAQCAtNzE1LDcgKzcxNyw3 IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRlKiBleGVjLCBKU1Zh bHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAgICAgZm9yIChpbnQg aSA9IDA7IGkgPCBsZW47ICsraSkgewogICAgICAgICAgICAgICAgICAgICAgICAgSlNWYWx1ZSB2 YWwgPSBhcnJheS0+Z2V0KGV4ZWMsIGkpOwogICAgICAgICAgICAgICAgICAgICAgICAgaW50IGl0 ZW1kaXN0ID0gLTE7Ci0gICAgICAgICAgICAgICAgICAgICAgICBRVmFyaWFudCBpdGVtID0gY29u dmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWwsIFFNZXRhVHlwZTo6SW50LCAmaXRlbWRpc3Qs IHZpc2l0ZWRPYmplY3RzKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIFFWYXJpYW50IGl0ZW0g PSBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KGV4ZWMsIHZhbCwgUU1ldGFUeXBlOjpJbnQsICZpdGVt ZGlzdCwgdmlzaXRlZE9iamVjdHMsIHJlY3Vyc2lvbkxpbWl0KTsKICAgICAgICAgICAgICAgICAg ICAgICAgIGlmIChpdGVtZGlzdCA+PSAwKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJl c3VsdC5hcHBlbmQoaXRlbS52YWx1ZTxpbnQ+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAg ZWxzZQpAQCAtNzMwLDcgKzczMiw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQo RXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAg ICAgICAgICAgICAgLy8gTWFrZSBhIHNpbmdsZSBsZW5ndGggYXJyYXkKICAgICAgICAgICAgICAg ICAgICAgUUxpc3Q8aW50PiByZXN1bHQ7CiAgICAgICAgICAgICAgICAgICAgIGludCBpdGVtZGlz dCA9IC0xOwotICAgICAgICAgICAgICAgICAgICBRVmFyaWFudCBpdGVtID0gY29udmVydFZhbHVl VG9RVmFyaWFudChleGVjLCB2YWx1ZSwgUU1ldGFUeXBlOjpJbnQsICZpdGVtZGlzdCwgdmlzaXRl ZE9iamVjdHMpOworICAgICAgICAgICAgICAgICAgICBRVmFyaWFudCBpdGVtID0gY29udmVydFZh bHVlVG9RVmFyaWFudChleGVjLCB2YWx1ZSwgUU1ldGFUeXBlOjpJbnQsICZpdGVtZGlzdCwgdmlz aXRlZE9iamVjdHMsIHJlY3Vyc2lvbkxpbWl0KTsKICAgICAgICAgICAgICAgICAgICAgaWYgKGl0 ZW1kaXN0ID49IDApIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoaXRl bS52YWx1ZTxpbnQ+KCkpOwogICAgICAgICAgICAgICAgICAgICAgICAgZGlzdCA9IDEwOwpAQCAt NzU3LDcgKzc1OSw3IEBAIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQoRXhlY1N0YXRl KiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUKICAgICAgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgICAgIC8vIEFuZCB0aGVuIHJlY3Vyc2Ugd2l0aCB0aGUg YXV0b2RldGVjdCBmbGFnCi0gICAgICAgICAgICAgICAgICAgIHJldCA9IGNvbnZlcnRWYWx1ZVRv UVZhcmlhbnQoZXhlYywgdmFsdWUsIFFNZXRhVHlwZTo6Vm9pZCwgZGlzdGFuY2UsIHZpc2l0ZWRP YmplY3RzKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0ID0gY29udmVydFZhbHVlVG9RVmFyaWFu dChleGVjLCB2YWx1ZSwgUU1ldGFUeXBlOjpWb2lkLCBkaXN0YW5jZSwgdmlzaXRlZE9iamVjdHMs IHJlY3Vyc2lvbkxpbWl0KTsKICAgICAgICAgICAgICAgICAgICAgZGlzdCA9IDEwOwogICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTc3Nyw4ICs3NzksOSBAQCBR VmFyaWFudCBjb252ZXJ0VmFsdWVUb1FWYXJpYW50KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSB2 YWx1ZSwgUU1ldGFUeXBlOjpUeXBlCiAKIFFWYXJpYW50IGNvbnZlcnRWYWx1ZVRvUVZhcmlhbnQo RXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIHZhbHVlLCBRTWV0YVR5cGU6OlR5cGUgaGludCwgaW50 ICpkaXN0YW5jZSkKIHsKKyAgICBjb25zdCBpbnQgcmVjdXJzaW9uTGltaXQgPSAyMDA7CiAgICAg SGFzaFNldDxKU09iamVjdCo+IHZpc2l0ZWRPYmplY3RzOwotICAgIHJldHVybiBjb252ZXJ0VmFs dWVUb1FWYXJpYW50KGV4ZWMsIHZhbHVlLCBoaW50LCBkaXN0YW5jZSwgJnZpc2l0ZWRPYmplY3Rz KTsKKyAgICByZXR1cm4gY29udmVydFZhbHVlVG9RVmFyaWFudChleGVjLCB2YWx1ZSwgaGludCwg ZGlzdGFuY2UsICZ2aXNpdGVkT2JqZWN0cywgcmVjdXJzaW9uTGltaXQpOwogfQogCiBKU1ZhbHVl IGNvbnZlcnRRVmFyaWFudFRvVmFsdWUoRXhlY1N0YXRlKiBleGVjLCBQYXNzUmVmUHRyPFJvb3RP YmplY3Q+IHJvb3QsIGNvbnN0IFFWYXJpYW50JiB2YXJpYW50KQo=