92168 2012-07-24 15:19:07 -0700 [V8] Correct WebIDL type should be used in the testing IDL file 2012-07-24 17:27:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli webkit-unassigned abarth haraken japhet jochen ojan webkit.review.bot oldest_to_newest 677249 0 jianli 2012-07-24 15:19:07 -0700 The V8int used in the bindings code is incorrect. > Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp:1740 > + EXCEPTION_BLOCK(int, intArg, V8int::HasInstance(MAYBE_MISSING_PARAMETER(args, 0, DefaultIsUndefined)) ? V8int::toNative(v8::Handle<v8::Object>::Cast(MAYBE_MISSING_PARAMETER(args, 0, DefaultIsUndefined))) : 0); 677265 1 abarth 2012-07-24 15:26:34 -0700 V8int isn't the problem. The problem is that you're using "int" in the IDL file, which is wrong. The correct type for integers in IDL is long. 677290 2 154159 jianli 2012-07-24 15:42:11 -0700 Created attachment 154159 Proposed Patch 677321 3 154159 haraken 2012-07-24 16:25:48 -0700 Comment on attachment 154159 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=154159&action=review > Source/WebCore/bindings/scripts/test/TestObj.idl:193 > + [V8EnabledAtRuntime=FeatureName] void enabledAtRuntimeMethod2(in long intArg); Let's rename to longArg. > Source/WebCore/bindings/scripts/test/TestObj.idl:198 > + [V8EnabledPerContext] void enabledPerContextMethod1(in long intArg); > + [V8EnabledPerContext=FeatureName] void enabledPerContextMethod2(in long intArg); Ditto. 677357 4 jianli 2012-07-24 16:52:04 -0700 Committed as http://trac.webkit.org/changeset/123550. 154159 2012-07-24 15:42:11 -0700 2012-07-24 17:27:18 -0700 Proposed Patch 92168 text/plain 9265 jianli ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiOWE1OTk1Li5iMDQxMTA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTItMDctMjQgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFtWOF0gQ29ycmVjdCBXZWJJREwgdHlwZSBzaG91bGQgYmUgdXNlZCBpbiB0aGUgdGVzdGluZyBJ REwgZmlsZSAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTkyMTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXBkYXRlZCBiaW5kaW5ncyB0ZXN0LgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5jcHA6CisgICAgICAgICh3ZWJraXRfZG9tX3Rlc3Rf b2JqX3N0cmljdF9mdW5jdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0dP YmplY3QvV2ViS2l0RE9NVGVzdE9iai5oOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVz dC9KUy9KU1Rlc3RPYmouY3BwOgorICAgICAgICAoV2ViQ29yZTo6anNUZXN0T2JqUHJvdG90eXBl RnVuY3Rpb25TdHJpY3RGdW5jdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L1Rlc3RPYmouaWRsOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RP YmouY3BwOgorICAgICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6OmVuYWJsZWRBdFJ1 bnRpbWVNZXRob2QxQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJu YWw6OmVuYWJsZWRBdFJ1bnRpbWVNZXRob2QyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6 VGVzdE9ialY4SW50ZXJuYWw6OmVuYWJsZWRQZXJDb250ZXh0TWV0aG9kMUNhbGxiYWNrKToKKyAg ICAgICAgKFdlYkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjplbmFibGVkUGVyQ29udGV4dE1ldGhv ZDJDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6c3RyaWN0 RnVuY3Rpb25DYWxsYmFjayk6CisKIDIwMTItMDctMjQgIEt3YW5nIFl1bCBTZW8gIDxza3l1bEBj b21wYW55MTAwLm5ldD4KIAogICAgICAgICBFbnN1cmUgTm9haCdzIGFyayB3aXRob3V0IHJlYWRp bmcgdGhlIERPTSB0cmVlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmNwcAppbmRleCAz YjYyNTNjLi40N2NiZTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJLaXRET01UZXN0T2JqLmNwcApAQCAt MTQzNiw3ICsxNDM2LDcgQEAgd2Via2l0X2RvbV90ZXN0X29ial9vcmFuZ2UoV2ViS2l0RE9NVGVz dE9iaiogc2VsZikKIH0KIAogV2ViS2l0RE9NYm9vbCoKLXdlYmtpdF9kb21fdGVzdF9vYmpfc3Ry aWN0X2Z1bmN0aW9uKFdlYktpdERPTVRlc3RPYmoqIHNlbGYsIGNvbnN0IGdjaGFyKiBzdHIsIGdm bG9hdCBhLCBnaW50IGIsIEdFcnJvcioqIGVycm9yKQord2Via2l0X2RvbV90ZXN0X29ial9zdHJp Y3RfZnVuY3Rpb24oV2ViS2l0RE9NVGVzdE9iaiogc2VsZiwgY29uc3QgZ2NoYXIqIHN0ciwgZ2Zs b2F0IGEsIGdsb25nIGIsIEdFcnJvcioqIGVycm9yKQogewogICAgIGdfcmV0dXJuX3ZhbF9pZl9m YWlsKHNlbGYsIDApOwogICAgIFdlYkNvcmU6OkpTTWFpblRocmVhZE51bGxTdGF0ZSBzdGF0ZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9HT2JqZWN0 L1dlYktpdERPTVRlc3RPYmouaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9HT2JqZWN0L1dlYktpdERPTVRlc3RPYmouaAppbmRleCA3MjdhNTM0Li40OGQ3M2ZmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvR09iamVjdC9XZWJL aXRET01UZXN0T2JqLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L0dPYmplY3QvV2ViS2l0RE9NVGVzdE9iai5oCkBAIC00ODcsMTQgKzQ4NywxNCBAQCB3ZWJraXRf ZG9tX3Rlc3Rfb2JqX29yYW5nZShXZWJLaXRET01UZXN0T2JqKiBzZWxmKTsKICAqIEBzZWxmOiBB ICNXZWJLaXRET01UZXN0T2JqCiAgKiBAc3RyOiBBICNnY2hhcgogICogQGE6IEEgI2dmbG9hdAot ICogQGI6IEEgI2dpbnQKKyAqIEBiOiBBICNnbG9uZwogICogQGVycm9yOiAjR0Vycm9yCiAgKgog ICogUmV0dXJuczogKHRyYW5zZmVyIG5vbmUpOgogICoKICoqLwogV0VCS0lUX0FQSSBXZWJLaXRE T01ib29sKgotd2Via2l0X2RvbV90ZXN0X29ial9zdHJpY3RfZnVuY3Rpb24oV2ViS2l0RE9NVGVz dE9iaiogc2VsZiwgY29uc3QgZ2NoYXIqIHN0ciwgZ2Zsb2F0IGEsIGdpbnQgYiwgR0Vycm9yKiog ZXJyb3IpOword2Via2l0X2RvbV90ZXN0X29ial9zdHJpY3RfZnVuY3Rpb24oV2ViS2l0RE9NVGVz dE9iaiogc2VsZiwgY29uc3QgZ2NoYXIqIHN0ciwgZ2Zsb2F0IGEsIGdsb25nIGIsIEdFcnJvcioq IGVycm9yKTsKIAogLyoqCiAgKiB3ZWJraXRfZG9tX3Rlc3Rfb2JqX2dldF9yZWFkX29ubHlfaW50 X2F0dHI6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv SlMvSlNUZXN0T2JqLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9K Uy9KU1Rlc3RPYmouY3BwCmluZGV4IDAxZmQ4ODguLjgzZmE5OWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCkBAIC0y NTExLDkgKzI1MTEsNyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpzVGVzdE9ialBy b3RvdHlwZUZ1bmN0aW9uU3RyaWN0RnVuY3Rpb24oRXhlY1N0YXRlKgogICAgIGZsb2F0IGEoTUFZ QkVfTUlTU0lOR19QQVJBTUVURVIoZXhlYywgMSwgRGVmYXVsdElzVW5kZWZpbmVkKS50b0Zsb2F0 KGV4ZWMpKTsKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBK U1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7Ci0gICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291 bnQoKSA+IDIgJiYgIWV4ZWMtPmFyZ3VtZW50KDIpLmlzVW5kZWZpbmVkT3JOdWxsKCkgJiYgIWV4 ZWMtPmFyZ3VtZW50KDIpLmluaGVyaXRzKCZKU2ludDo6c19pbmZvKSkKLSAgICAgICAgcmV0dXJu IHRocm93Vk1UeXBlRXJyb3IoZXhlYyk7Ci0gICAgaW50KiBiKHRvaW50KE1BWUJFX01JU1NJTkdf UEFSQU1FVEVSKGV4ZWMsIDIsIERlZmF1bHRJc1VuZGVmaW5lZCkpKTsKKyAgICBpbnQgYihNQVlC RV9NSVNTSU5HX1BBUkFNRVRFUihleGVjLCAyLCBEZWZhdWx0SXNVbmRlZmluZWQpLnRvSW50MzIo ZXhlYykpOwogICAgIGlmIChleGVjLT5oYWRFeGNlcHRpb24oKSkKICAgICAgICAgcmV0dXJuIEpT VmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsCmluZGV4IDg4N2I3NmQuLjMzZGNkOTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlk bAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwK QEAgLTE4OSwxMyArMTg5LDEzIEBAIG1vZHVsZSB0ZXN0IHsKIAogI2lmIGRlZmluZWQoVEVTVElO R19WOCkKICAgICAgICAgLy8gJ1Y4RW5hYmxlZEF0UnVudGltZScgbWV0aG9kcyBhbmQgYXR0cmli dXRlcy4KLSAgICAgICAgW1Y4RW5hYmxlZEF0UnVudGltZV0gdm9pZCBlbmFibGVkQXRSdW50aW1l TWV0aG9kMShpbiBpbnQgaW50QXJnKTsKLSAgICAgICAgW1Y4RW5hYmxlZEF0UnVudGltZT1GZWF0 dXJlTmFtZV0gdm9pZCBlbmFibGVkQXRSdW50aW1lTWV0aG9kMihpbiBpbnQgaW50QXJnKTsKKyAg ICAgICAgW1Y4RW5hYmxlZEF0UnVudGltZV0gdm9pZCBlbmFibGVkQXRSdW50aW1lTWV0aG9kMShp biBsb25nIGludEFyZyk7CisgICAgICAgIFtWOEVuYWJsZWRBdFJ1bnRpbWU9RmVhdHVyZU5hbWVd IHZvaWQgZW5hYmxlZEF0UnVudGltZU1ldGhvZDIoaW4gbG9uZyBpbnRBcmcpOwogICAgICAgICBh dHRyaWJ1dGUgW1Y4RW5hYmxlZEF0UnVudGltZV0gbG9uZyBlbmFibGVkQXRSdW50aW1lQXR0cjE7 CiAgICAgICAgIGF0dHJpYnV0ZSBbVjhFbmFibGVkQXRSdW50aW1lPUZlYXR1cmVOYW1lXSBsb25n IGVuYWJsZWRBdFJ1bnRpbWVBdHRyMjsKICAgICAgICAgLy8gJ1Y4RW5hYmxlZFBlckNvbnRleHQn IG1ldGhvZHMgYW5kIGF0dHJpYnV0ZXMuCi0gICAgICAgIFtWOEVuYWJsZWRQZXJDb250ZXh0XSB2 b2lkIGVuYWJsZWRQZXJDb250ZXh0TWV0aG9kMShpbiBpbnQgaW50QXJnKTsKLSAgICAgICAgW1Y4 RW5hYmxlZFBlckNvbnRleHQ9RmVhdHVyZU5hbWVdIHZvaWQgZW5hYmxlZFBlckNvbnRleHRNZXRo b2QyKGluIGludCBpbnRBcmcpOworICAgICAgICBbVjhFbmFibGVkUGVyQ29udGV4dF0gdm9pZCBl bmFibGVkUGVyQ29udGV4dE1ldGhvZDEoaW4gbG9uZyBpbnRBcmcpOworICAgICAgICBbVjhFbmFi bGVkUGVyQ29udGV4dD1GZWF0dXJlTmFtZV0gdm9pZCBlbmFibGVkUGVyQ29udGV4dE1ldGhvZDIo aW4gbG9uZyBpbnRBcmcpOwogICAgICAgICBhdHRyaWJ1dGUgW1Y4RW5hYmxlZFBlckNvbnRleHRd IGxvbmcgZW5hYmxlZFBlckNvbnRleHRBdHRyMTsKICAgICAgICAgYXR0cmlidXRlIFtWOEVuYWJs ZWRQZXJDb250ZXh0PUZlYXR1cmVOYW1lXSBsb25nIGVuYWJsZWRQZXJDb250ZXh0QXR0cjI7CiAj ZW5kaWYKQEAgLTIzMiw3ICsyMzIsNyBAQCBtb2R1bGUgdGVzdCB7CiAgICAgICAgIGF0dHJpYnV0 ZSBbSW1wbGVtZW50ZWRBcz1ibHVlYmVycnldIGludCBzdHJhd2JlcnJ5OwogCiAgICAgICAgIGF0 dHJpYnV0ZSBbU3RyaWN0VHlwZUNoZWNraW5nXSBmbG9hdCBzdHJpY3RGbG9hdDsKLSAgICAgICAg W1N0cmljdFR5cGVDaGVja2luZ10gYm9vbCBzdHJpY3RGdW5jdGlvbihpbiBET01TdHJpbmcgc3Ry LCBpbiBmbG9hdCBhLCBpbiBpbnQgYikKKyAgICAgICAgW1N0cmljdFR5cGVDaGVja2luZ10gYm9v bCBzdHJpY3RGdW5jdGlvbihpbiBET01TdHJpbmcgc3RyLCBpbiBmbG9hdCBhLCBpbiBsb25nIGIp CiAgICAgICAgICAgICByYWlzZXMoRE9NRXhjZXB0aW9uKTsKIAogICAgICAgICAvLyBPYmplY3Rp dmVDIHJlc2VydmVkIHdvcmRzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcAppbmRleCBjMzQxOTVmLi4zYTNhMzIwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2Jq LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0 T2JqLmNwcApAQCAtMTcxNSw3ICsxNzE1LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBlbmFibGVkQXRSdW50aW1lTWV0aG9kMUNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMKICAg ICBpZiAoYXJncy5MZW5ndGgoKSA8IDEpCiAgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd05v dEVub3VnaEFyZ3VtZW50c0Vycm9yKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBUZXN0T2JqKiBp bXAgPSBWOFRlc3RPYmo6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwotICAgIEVYQ0VQVElPTl9C TE9DSyhpbnQsIGludEFyZywgVjhpbnQ6Okhhc0luc3RhbmNlKE1BWUJFX01JU1NJTkdfUEFSQU1F VEVSKGFyZ3MsIDAsIERlZmF1bHRJc1VuZGVmaW5lZCkpID8gVjhpbnQ6OnRvTmF0aXZlKHY4OjpI YW5kbGU8djg6Ok9iamVjdD46OkNhc3QoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoYXJncywgMCwg RGVmYXVsdElzVW5kZWZpbmVkKSkpIDogMCk7CisgICAgRVhDRVBUSU9OX0JMT0NLKGludCwgaW50 QXJnLCB0b0ludDMyKE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGFyZ3MsIDAsIERlZmF1bHRJc1Vu ZGVmaW5lZCkpKTsKICAgICBpbXAtPmVuYWJsZWRBdFJ1bnRpbWVNZXRob2QxKGludEFyZyk7CiAg ICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwogfQpAQCAtMTcyNiw3ICsxNzI2LDcg QEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBlbmFibGVkQXRSdW50aW1lTWV0aG9kMkNh bGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMKICAgICBpZiAoYXJncy5MZW5ndGgoKSA8IDEpCiAg ICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJvd05vdEVub3VnaEFyZ3VtZW50c0Vycm9yKGFyZ3Mu R2V0SXNvbGF0ZSgpKTsKICAgICBUZXN0T2JqKiBpbXAgPSBWOFRlc3RPYmo6OnRvTmF0aXZlKGFy Z3MuSG9sZGVyKCkpOwotICAgIEVYQ0VQVElPTl9CTE9DSyhpbnQsIGludEFyZywgVjhpbnQ6Okhh c0luc3RhbmNlKE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGFyZ3MsIDAsIERlZmF1bHRJc1VuZGVm aW5lZCkpID8gVjhpbnQ6OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoTUFZ QkVfTUlTU0lOR19QQVJBTUVURVIoYXJncywgMCwgRGVmYXVsdElzVW5kZWZpbmVkKSkpIDogMCk7 CisgICAgRVhDRVBUSU9OX0JMT0NLKGludCwgaW50QXJnLCB0b0ludDMyKE1BWUJFX01JU1NJTkdf UEFSQU1FVEVSKGFyZ3MsIDAsIERlZmF1bHRJc1VuZGVmaW5lZCkpKTsKICAgICBpbXAtPmVuYWJs ZWRBdFJ1bnRpbWVNZXRob2QyKGludEFyZyk7CiAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZh bHVlPigpOwogfQpAQCAtMTczNyw3ICsxNzM3LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBlbmFibGVkUGVyQ29udGV4dE1ldGhvZDFDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnQK ICAgICBpZiAoYXJncy5MZW5ndGgoKSA8IDEpCiAgICAgICAgIHJldHVybiBWOFByb3h5Ojp0aHJv d05vdEVub3VnaEFyZ3VtZW50c0Vycm9yKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBUZXN0T2Jq KiBpbXAgPSBWOFRlc3RPYmo6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwotICAgIEVYQ0VQVElP Tl9CTE9DSyhpbnQsIGludEFyZywgVjhpbnQ6Okhhc0luc3RhbmNlKE1BWUJFX01JU1NJTkdfUEFS QU1FVEVSKGFyZ3MsIDAsIERlZmF1bHRJc1VuZGVmaW5lZCkpID8gVjhpbnQ6OnRvTmF0aXZlKHY4 OjpIYW5kbGU8djg6Ok9iamVjdD46OkNhc3QoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoYXJncywg MCwgRGVmYXVsdElzVW5kZWZpbmVkKSkpIDogMCk7CisgICAgRVhDRVBUSU9OX0JMT0NLKGludCwg aW50QXJnLCB0b0ludDMyKE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGFyZ3MsIDAsIERlZmF1bHRJ c1VuZGVmaW5lZCkpKTsKICAgICBpbXAtPmVuYWJsZWRQZXJDb250ZXh0TWV0aG9kMShpbnRBcmcp OwogICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKIH0KQEAgLTE3NDgsNyArMTc0 OCw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZW5hYmxlZFBlckNvbnRleHRNZXRo b2QyQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50CiAgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPCAx KQogICAgICAgICByZXR1cm4gVjhQcm94eTo6dGhyb3dOb3RFbm91Z2hBcmd1bWVudHNFcnJvcihh cmdzLkdldElzb2xhdGUoKSk7CiAgICAgVGVzdE9iaiogaW1wID0gVjhUZXN0T2JqOjp0b05hdGl2 ZShhcmdzLkhvbGRlcigpKTsKLSAgICBFWENFUFRJT05fQkxPQ0soaW50LCBpbnRBcmcsIFY4aW50 OjpIYXNJbnN0YW5jZShNQVlCRV9NSVNTSU5HX1BBUkFNRVRFUihhcmdzLCAwLCBEZWZhdWx0SXNV bmRlZmluZWQpKSA/IFY4aW50Ojp0b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+OjpDYXN0 KE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGFyZ3MsIDAsIERlZmF1bHRJc1VuZGVmaW5lZCkpKSA6 IDApOworICAgIEVYQ0VQVElPTl9CTE9DSyhpbnQsIGludEFyZywgdG9JbnQzMihNQVlCRV9NSVNT SU5HX1BBUkFNRVRFUihhcmdzLCAwLCBEZWZhdWx0SXNVbmRlZmluZWQpKSk7CiAgICAgaW1wLT5l bmFibGVkUGVyQ29udGV4dE1ldGhvZDIoaW50QXJnKTsKICAgICByZXR1cm4gdjg6OkhhbmRsZTx2 ODo6VmFsdWU+KCk7CiB9CkBAIC0xODc1LDcgKzE4NzUsNyBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IHN0cmljdEZ1bmN0aW9uQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJn cykKICAgICB7CiAgICAgU1RSSU5HX1RPX1Y4UEFSQU1FVEVSX0VYQ0VQVElPTl9CTE9DSyhWOFBh cmFtZXRlcjw+LCBzdHIsIE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGFyZ3MsIDAsIERlZmF1bHRJ c1VuZGVmaW5lZCkpOwogICAgIEVYQ0VQVElPTl9CTE9DSyhmbG9hdCwgYSwgc3RhdGljX2Nhc3Q8 ZmxvYXQ+KE1BWUJFX01JU1NJTkdfUEFSQU1FVEVSKGFyZ3MsIDEsIERlZmF1bHRJc1VuZGVmaW5l ZCktPk51bWJlclZhbHVlKCkpKTsKLSAgICBFWENFUFRJT05fQkxPQ0soaW50LCBiLCBWOGludDo6 SGFzSW5zdGFuY2UoTUFZQkVfTUlTU0lOR19QQVJBTUVURVIoYXJncywgMiwgRGVmYXVsdElzVW5k ZWZpbmVkKSkgPyBWOGludDo6dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0Pjo6Q2FzdChN QVlCRV9NSVNTSU5HX1BBUkFNRVRFUihhcmdzLCAyLCBEZWZhdWx0SXNVbmRlZmluZWQpKSkgOiAw KTsKKyAgICBFWENFUFRJT05fQkxPQ0soaW50LCBiLCB0b0ludDMyKE1BWUJFX01JU1NJTkdfUEFS QU1FVEVSKGFyZ3MsIDIsIERlZmF1bHRJc1VuZGVmaW5lZCkpKTsKICAgICBSZWZQdHI8Ym9vbD4g cmVzdWx0ID0gaW1wLT5zdHJpY3RGdW5jdGlvbihzdHIsIGEsIGIsIGVjKTsKICAgICBpZiAoVU5M SUtFTFkoZWMpKQogICAgICAgICBnb3RvIGZhaWw7Cg==