8170 2006-04-03 22:29:00 -0700 SVG CSS property values with extra items do not get treated as invalid (they should) 2006-04-23 15:53:42 -0700 1 1 1 Unclassified WebKit SVG 420+ Mac OS X 10.4 RESOLVED FIXED NeedsReduction P2 Normal --- 1 ap webkit-unassigned joost oldest_to_newest 38470 0 ap 2006-04-03 22:29:00 -0700 SVG CSS properties that have too many elements aren't invalidated, like it used to be the case with HTML properties, see bug 7118. The fix should be very similar, but there is no test case to verify it yet. Actually, SVGCSSParser already does the invalidation when handling the valid_primitive case, but not in some other cases. 39915 1 7849 rwlbuis 2006-04-20 06:54:13 -0700 Created attachment 7849 Proposed fix This is my first attempt. From the few small tests I did it handles the parsedValue cases ok (for stroke and clip-path). In khtml/css/cssparser.cpp the code checks shorthands, but for svg there only seems to be the marker property, which gets handled in parseShorthand. Cheers, Rob. 39928 2 7854 rwlbuis 2006-04-20 13:02:14 -0700 Created attachment 7854 Better yet After feedback from ap, this one is much better. It removes my faulty cleanup. Also it now handles initial and inherit cases, and shorthands (marker) works too. IMHO all that is lacking is a testcase, which I am working on, but will take some time. Cheers, Rob. 39979 3 7854 eric 2006-04-20 15:10:22 -0700 Comment on attachment 7854 Better yet Hyatt should review this. 39988 4 7854 hyatt 2006-04-20 18:10:35 -0700 Comment on attachment 7854 Better yet You're missing the inShorthand check when you check to see if value->current() is null. If you're inside an SVG shorthand there could still be properties that will be parsed afterwards. 40050 5 rwlbuis 2006-04-21 11:59:08 -0700 (In reply to comment #4) > (From update of attachment 7854 [edit]) > You're missing the inShorthand check when you check to see if value->current() > is null. If you're inside an SVG shorthand there could still be properties > that will be parsed afterwards. > Hi, I think there is such a call in the last patch. If you still think it lacks, please let me know, I am working on wrapping this patch up including testcase :) Cheers, Rob. 40056 6 7883 rwlbuis 2006-04-21 12:47:09 -0700 Created attachment 7883 Complete patch This time the patch + testcase. Cheers, Rob. 40082 7 7883 hyatt 2006-04-21 22:02:20 -0700 Comment on attachment 7883 Complete patch r=me 40263 8 eric 2006-04-23 15:53:42 -0700 Thanks rob! 7849 2006-04-20 06:54:13 -0700 2006-04-20 13:02:36 -0700 Proposed fix 8170.diff text/plain 2015 rwlbuis SW5kZXg6IFdlYkNvcmUva3N2ZzIvY3NzL1NWR0NTU1BhcnNlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9rc3ZnMi9jc3MvU1ZHQ1NTUGFyc2VyLmNwcAkocmV2aXNpb24gMTM5ODYpCisrKyBX ZWJDb3JlL2tzdmcyL2Nzcy9TVkdDU1NQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTAs MTAgKzE5MCw4IEBACiAKICAgICBjYXNlIFNWR0NTU19QUk9QX0dMWVBIX09SSUVOVEFUSU9OX1ZF UlRJQ0FMOiAvLyBhdXRvIHwgPGFuZ2xlPiB8IGluaGVyaXQKICAgICAgICAgaWYoaWQgPT0gQ1NT X1ZBTF9BVVRPKQotICAgICAgICB7CiAgICAgICAgICAgICB2YWxpZF9wcmltaXRpdmUgPSB0cnVl OwotICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KKyAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBTVkdDU1NfUFJPUF9HTFlQSF9PUklFTlRBVElPTl9IT1JJWk9OVEFMOiAvLyA8YW5nbGU+IHwg aW5oZXJpdAogICAgICAgICBpZih2YWx1ZS0+dW5pdCA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NT X0RFRykKICAgICAgICAgICAgIHBhcnNlZFZhbHVlID0gbmV3IENTU1ByaW1pdGl2ZVZhbHVlKHZh bHVlLT5mVmFsdWUsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfREVHKTsKQEAgLTI3MSwxNCArMjY5 LDYgQEAKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdmFsaWRfcHJpbWl0aXZlID0gdmFsaWRV bml0KHZhbHVlLCBGTGVuZ3RoLCBmYWxzZSk7CiAgICAgICAgIGJyZWFrOwotICAgIC8qIHNob3J0 aGFuZCBwcm9wZXJ0aWVzICovCi0gICAgY2FzZSBTVkdDU1NfUFJPUF9NQVJLRVI6Ci0gICAgewot ICAgICAgICAgICAgY29uc3QgaW50IHByb3BlcnRpZXNbM10gPSB7IFNWR0NTU19QUk9QX01BUktF Ul9TVEFSVCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTVkdDU1Nf UFJPUF9NQVJLRVJfTUlELAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFNWR0NTU19QUk9QX01BUktFUl9FTkQgfTsKLSAgICAgICAgICAgIHJldHVybiBwYXJzZVNob3J0 aGFuZChwcm9wSWQsIHByb3BlcnRpZXMsIDMsIGltcG9ydGFudCk7Ci0gICAgfQogCiAgICAgY2Fz ZSBTVkdDU1NfUFJPUF9DTElQX1BBVEg6ICAgIC8vIDx1cmk+IHwgbm9uZSB8IGluaGVyaXQKICAg ICBjYXNlIFNWR0NTU19QUk9QX0ZJTFRFUjoKQEAgLTI5MSw2ICsyODEsMTQgQEAKICAgICAgICAg ICAgICAgICB2YWx1ZUxpc3QtPm5leHQoKTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKKyAg ICAvKiBzaG9ydGhhbmQgcHJvcGVydGllcyAqLworICAgIGNhc2UgU1ZHQ1NTX1BST1BfTUFSS0VS OgorICAgIHsKKyAgICAgICAgICAgIGNvbnN0IGludCBwcm9wZXJ0aWVzWzNdID0geyBTVkdDU1Nf UFJPUF9NQVJLRVJfU1RBUlQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgU1ZHQ1NTX1BST1BfTUFSS0VSX01JRCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBTVkdDU1NfUFJPUF9NQVJLRVJfRU5EIH07CisgICAgICAgICAgICByZXR1cm4g cGFyc2VTaG9ydGhhbmQocHJvcElkLCBwcm9wZXJ0aWVzLCAzLCBpbXBvcnRhbnQpOworICAgIH0K IAogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTMxNCw4ICszMTIsMTEg QEAKICAgICB9CiAgICAgaWYocGFyc2VkVmFsdWUpCiAgICAgewotICAgICAgICBhZGRQcm9wZXJ0 eShwcm9wSWQsIHBhcnNlZFZhbHVlLCBpbXBvcnRhbnQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICAgICAgaWYgKCF2YWx1ZUxpc3QtPmN1cnJlbnQoKSkgeworICAgICAgICAgICAgYWRkUHJv cGVydHkocHJvcElkLCBwYXJzZWRWYWx1ZSwgaW1wb3J0YW50KTsKKyAgICAgICAgICAgIHJldHVy biB0cnVlOworICAgICAgICB9CisgICAgICAgIGRlbGV0ZSBwYXJzZWRWYWx1ZTsKICAgICB9CiAg ICAgcmV0dXJuIGZhbHNlOwogfQo= 7854 2006-04-20 13:02:14 -0700 2006-04-21 12:47:09 -0700 Better yet 8170.diff text/plain 2313 rwlbuis SW5kZXg6IFdlYkNvcmUva3N2ZzIvY3NzL1NWR0NTU1BhcnNlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9rc3ZnMi9jc3MvU1ZHQ1NTUGFyc2VyLmNwcAkocmV2aXNpb24gMTM5ODYpCisrKyBX ZWJDb3JlL2tzdmcyL2Nzcy9TVkdDU1NQYXJzZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MCwx MCArNTAsMTcgQEAKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgaW50IGlkID0gdmFsdWUt PmlkOworCisgICAgaW50IG51bSA9IGluU2hvcnRoYW5kKCkgPyAxIDogdmFsdWVMaXN0LT5zaXpl KCk7CisKICAgICBpZiAoaWQgPT0gQ1NTX1ZBTF9JTkhFUklUKSB7CisgICAgICAgIGlmIChudW0g IT0gMSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgYWRkUHJvcGVydHkocHJv cElkLCBuZXcgQ1NTSW5oZXJpdGVkVmFsdWUoKSwgaW1wb3J0YW50KTsKICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgfSBlbHNlIGlmIChpZCA9PSBDU1NfVkFMX0lOSVRJQUwpIHsKKyAgICAgICAg aWYgKG51bSAhPSAxKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBhZGRQcm9w ZXJ0eShwcm9wSWQsIG5ldyBDU1NJbml0aWFsVmFsdWUoKSwgaW1wb3J0YW50KTsKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMjcxLDE0ICsyNzgsNiBAQAogICAgICAgICBlbHNlCiAg ICAgICAgICAgICB2YWxpZF9wcmltaXRpdmUgPSB2YWxpZFVuaXQodmFsdWUsIEZMZW5ndGgsIGZh bHNlKTsKICAgICAgICAgYnJlYWs7Ci0gICAgLyogc2hvcnRoYW5kIHByb3BlcnRpZXMgKi8KLSAg ICBjYXNlIFNWR0NTU19QUk9QX01BUktFUjoKLSAgICB7Ci0gICAgICAgICAgICBjb25zdCBpbnQg cHJvcGVydGllc1szXSA9IHsgU1ZHQ1NTX1BST1BfTUFSS0VSX1NUQVJULAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNWR0NTU19QUk9QX01BUktFUl9NSUQsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU1ZHQ1NTX1BST1BfTUFSS0VSX0VO RCB9OwotICAgICAgICAgICAgcmV0dXJuIHBhcnNlU2hvcnRoYW5kKHByb3BJZCwgcHJvcGVydGll cywgMywgaW1wb3J0YW50KTsKLSAgICB9CiAKICAgICBjYXNlIFNWR0NTU19QUk9QX0NMSVBfUEFU SDogICAgLy8gPHVyaT4gfCBub25lIHwgaW5oZXJpdAogICAgIGNhc2UgU1ZHQ1NTX1BST1BfRklM VEVSOgpAQCAtMjkyLDYgKzI5MSwxNCBAQAogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCisg ICAgLyogc2hvcnRoYW5kIHByb3BlcnRpZXMgKi8KKyAgICBjYXNlIFNWR0NTU19QUk9QX01BUktF UjoKKyAgICB7CisgICAgICAgIGNvbnN0IGludCBwcm9wZXJ0aWVzWzNdID0geyBTVkdDU1NfUFJP UF9NQVJLRVJfU1RBUlQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTVkdD U1NfUFJPUF9NQVJLRVJfTUlELAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg U1ZHQ1NTX1BST1BfTUFSS0VSX0VORCB9OworICAgICAgICByZXR1cm4gcGFyc2VTaG9ydGhhbmQo cHJvcElkLCBwcm9wZXJ0aWVzLCAzLCBpbXBvcnRhbnQpOworICAgIH0KICAgICBkZWZhdWx0Ogog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQpAQCAtMzA3LDE1ICszMTQsMTQgQEAKICAgICAg ICAgZWxzZSBpZih2YWx1ZS0+dW5pdCA+PSBLRE9NQ1NTVmFsdWU6OlFfRU1TKQogICAgICAgICAg ICAgcGFyc2VkVmFsdWUgPSBuZXcgQ1NTUXVpcmtQcmltaXRpdmVWYWx1ZSh2YWx1ZS0+ZlZhbHVl LCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX0VNUyk7CiAgICAgICAgIHZhbHVlTGlzdC0+bmV4dCgp OwotICAgICAgICBpZiAodmFsdWVMaXN0LT5jdXJyZW50KCkpIHsKLSAgICAgICAgICAgIGRlbGV0 ZSBwYXJzZWRWYWx1ZTsKLSAgICAgICAgICAgIHBhcnNlZFZhbHVlID0gMDsKLSAgICAgICAgfQog ICAgIH0KICAgICBpZihwYXJzZWRWYWx1ZSkKICAgICB7Ci0gICAgICAgIGFkZFByb3BlcnR5KHBy b3BJZCwgcGFyc2VkVmFsdWUsIGltcG9ydGFudCk7Ci0gICAgICAgIHJldHVybiB0cnVlOworICAg ICAgICBpZiAoIXZhbHVlTGlzdC0+Y3VycmVudCgpIHx8IGluU2hvcnRoYW5kKCkpIHsKKyAgICAg ICAgICAgIGFkZFByb3BlcnR5KHByb3BJZCwgcGFyc2VkVmFsdWUsIGltcG9ydGFudCk7CisgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICBkZWxldGUgcGFyc2VkVmFs dWU7CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKIH0K 7883 2006-04-21 12:47:09 -0700 2006-04-21 22:02:20 -0700 Complete patch 8170.diff text/plain 6839 rwlbuis SW5kZXg6IExheW91dFRlc3RzL3N2Zy9jdXN0b20vaW52YWxpZC1jc3Muc3ZnCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL3N2Zy9jdXN0b20vaW52YWxpZC1jc3Muc3ZnCShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS9pbnZhbGlkLWNzcy5zdmcJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsNTEgQEAKKzw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Cis8 IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3 LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPgorPHN2ZyB2ZXJzaW9uPSIx LjEiIGJhc2VQcm9maWxlPSJmdWxsIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmci IHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiBpZD0ic3ZnLXJvb3Qi IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCA0ODAgMzYwIj4KKyAgICA8 c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWworICAgICAgICAvKiB1c2UgZXh0cmEgdmFs dWUgKGF1dG8pIHRvIG1ha2UgdGhlIGNzcyBwcm9wZXJ0aWVzIGludmFsaWQgKi8KKyAgICAgICAg I3BhdGgxIHsKKyAgICAgICAgICAgIGZpbGw6IHJlZCBhdXRvOworICAgICAgICAgICAgZmlsbC1y dWxlOiBldmVub2RkIGF1dG87CisgICAgICAgICAgICBmaWxsLW9wYWNpdHk6IDEwJSBhdXRvOwor ICAgICAgICAgICAgbWFya2VyLXN0YXJ0OiB1cmwoI21hcmtlcjEpIGF1dG87CisgICAgICAgICAg ICBtYXJrZXItbWlkOiB1cmwoI21hcmtlcjEpIGF1dG87CisgICAgICAgICAgICBtYXJrZXItZW5k OiB1cmwoI21hcmtlcjEpIGF1dG87CisgICAgICAgICAgICBtYXJrZXI6IHVybCgjbWFya2VyMSkg IHVybCgjbWFya2VyMSkgIHVybCgjbWFya2VyMSkgYXV0bzsKKyAgICAgICAgICAgIHN0cm9rZS13 aWR0aDogMTAwIGF1dG87CisgICAgICAgICAgICBzdHJva2Utb3BhY2l0eTogMTAlIGF1dG87Cisg ICAgICAgICAgICBzdHJva2UtZGFzaGFycmF5OiAxMCA1IDEwIGF1dG87CisgICAgICAgICAgICBj bGlwLXBhdGg6IHVybCgjY2xpcDEpIGF1dG87CisgICAgICAgICAgICBjbGlwLXJ1bGU6IGV2ZW5v ZGQgYXV0bzsKKyAgICAgICAgICAgIG9wYWNpdHk6IDAlOyAvKiBkb2VzIG5vdCBzZWVtIHN1cHBv cnRlZCB5ZXQgKi8KKyAgICAgICAgICAgIHZpc2liaWxpdHk6IGhpZGRlbiBhdXRvOworICAgICAg ICB9CisgICAgICAgICNjaXJjbGUgeworICAgICAgICAgICAgZmlsdGVyOiB1cmwoI2JsdXJ4eSkg YXV0bzsKKyAgICAgICAgfQorICAgICAgICBzdG9wIHsKKyAgICAgICAgICAgIHN0b3AtY29sb3I6 IHJlZCBhdXRvOworICAgICAgICAgICAgc3RvcC1vcGFjaXR5OiAxMCUgYXV0bzsKKyAgICAgICAg fQorICAgICAgICAvKiB0ZXN0IHRleHQgY3NzIHByb3BzIHRvbz8gKi8KKyAgICBdXT48L3N0eWxl PgorICAgIDxkZWZzPgorICAgICAgICA8Y2xpcFBhdGggaWQ9ImNsaXAxIj4KKyAgICAgICAgICAg IDxjaXJjbGUgY3g9IjMwIiBjeT0iNDAiIHI9IjEwIi8+CisgICAgICAgIDwvY2xpcFBhdGg+Cisg ICAgICAgIDxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZCIgZ3JhZGllbnRVbml0cz0ib2JqZWN0Qm91 bmRpbmdCb3giIHgxPSIwIiB5MT0iMCIgeDI9IjEiIHkyPSIwIj4KKyAgICAgICAgICAgIDxzdG9w IHN0b3AtY29sb3I9ImdyZWVuIiAgb2Zmc2V0PSIwIi8+CisgICAgICAgIDwvbGluZWFyR3JhZGll bnQ+CisgICAgPC9kZWZzPgorICAgIDxmaWx0ZXIgaWQ9ImJsdXJ4eSIgZmlsdGVyVW5pdHM9Im9i amVjdEJvdW5kaW5nQm94IiB4PSItMTAlIiB5PSItMTAlIiB3aWR0aD0iMTIwJSIgaGVpZ2h0PSIx MjAlIj4KKyAgICAgICAgPGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iNSAxIi8+CisgICAg PC9maWx0ZXI+CisgICAgPG1hcmtlciBpZD0ibWFya2VyMSIgdmlld0JveD0iMCAwIDEwIDEwIiBt YXJrZXJXaWR0aD0iMiIgbWFya2VySGVpZ2h0PSIyIiByZWZYPSI1IiByZWZZPSI1IiBtYXJrZXJV bml0cz0ic3Ryb2tlV2lkdGgiPgorICAgICAgICA8cmVjdCB3aWR0aD0iMTAiIGhlaWdodD0iMTAi IGZpbGw9InJlZCIgc3Ryb2tlPSJub25lIi8+CisgICAgPC9tYXJrZXI+CisgICAgPHRleHQgeD0i MCIgeT0iMTMiPlRoZSByZWN0IHNob3VsZCBiZSBvcGFxdWUgZ3JlZW4sIGJsYWNrIHN0cm9rZSw8 L3RleHQ+CisgICAgPHRleHQgeD0iMCIgeT0iMzMiPm5vIG1hcmtlcnMgYW5kIG5vIGRhc2hlcy48 L3RleHQ+CisgICAgPHBhdGggaWQ9InBhdGgxIiBmaWxsPSJncmVlbiIgc3Ryb2tlPSJibGFjayIg ZD0iTSAzMCA0MCBMIDgwIDQwIEwgODAgOTAgIEwgMzAgOTAgWiIvPgorICAgIDxjaXJjbGUgaWQ9 InBhdGgyIiBmaWxsPSJ1cmwoI2dyYWQpIiBzdHJva2U9ImJsYWNrIiBjeD0iMTgwIiBjeT0iNjAi IHI9IjIwIi8+CisgICAgPHRleHQgeD0iMCIgeT0iMTEwIj5UaGUgY2lyY2xlIHNob3VsZCBiZSBv cGFxdWUgZ3JlZW4sIG5vIGZpbHRlciw8L3RleHQ+CisgICAgPHRleHQgeD0iMCIgeT0iMTMwIj5n cmVlbiBzdG9wIGNvbG9yLjwvdGV4dD4KKzwvc3ZnPgpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMTQwMDAp CisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMSBA QAorMjAwNi0wNC0yMSAgUm9iIEJ1aXMgIDxidWlzQGtkZS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdHMgZm9yIGludmFsaWQgc3ZnIGNz cyBwcm9wZXJ0aWVzLgorCisgICAgICAgICogc3ZnL2N1c3RvbS9pbnZhbGlkLWNzcy5zdmc6IEFk ZGVkLgorCiAyMDA2LTA0LTIxICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAg ICAgICBBZGRpbmcgYSBmZXcgbW9yZSBiYWNrZ3JvdW5kLXNpemUgdGVzdHMgdGhhdCBpbmNsdWRl IGJhY2tncm91bmQtCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQwMDApCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDA2LTA0LTIxICBSb2IgQnVpcyAgPGJ1aXNA a2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBGaXggZm9yIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODE3MDoKKyAgICAgICAgU1ZHIENTUyBwcm9wZXJ0eSB2YWx1ZXMgd2l0aCBleHRyYSBpdGVtcyBk byBub3QgZ2V0IHRyZWF0ZWQKKyAgICAgICAgYXMgaW52YWxpZCAodGhleSBzaG91bGQpCisKKyAg ICAgICAgRml4ZXMgdGhlIGhhbmRsaW5nIG9mIGludmFsaWQgc3ZnIGNzcyBwcm9wZXJ0aWVzIHNp bWlsYXIKKyAgICAgICAgdG8gaG93IGludmFsaWQgaHRtbCBjc3MgcHJvcGVydGllcyBhcmUgaGFu ZGxlZCwgaWUuIGRpc2NhcmQKKyAgICAgICAgdGhlIHByb3BlcnR5IGlmIHRoZXJlIGFyZSBtb3Jl IHZhbHVlcyBpbiB0aGUgdmFsdWUgbGlzdCB0aGFuCisgICAgICAgIGV4cGVjdGVkLgorCisgICAg ICAgICoga3N2ZzIvY3NzL1NWR0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQ YXJzZXI6OnBhcnNlU1ZHVmFsdWUpOgorCiAyMDA2LTA0LTIxICBHZW9mZnJleSBHYXJlbiAgPGdn YXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgLSBBbmQgYWdhaW4uCkluZGV4OiBXZWJDb3JlL2tz dmcyL2Nzcy9TVkdDU1NQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUva3N2ZzIvY3Nz L1NWR0NTU1BhcnNlci5jcHAJKHJldmlzaW9uIDE0MDAwKQorKysgV2ViQ29yZS9rc3ZnMi9jc3Mv U1ZHQ1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsMTAgKzUwLDE3IEBAIGJvb2wg Q1NTUGFyc2VyOjpwYXJzZVNWR1ZhbHVlKGludCBwcm9wSWQKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgaW50IGlkID0gdmFsdWUtPmlkOworCisgICAgaW50IG51bSA9IGluU2hvcnRoYW5k KCkgPyAxIDogdmFsdWVMaXN0LT5zaXplKCk7CisKICAgICBpZiAoaWQgPT0gQ1NTX1ZBTF9JTkhF UklUKSB7CisgICAgICAgIGlmIChudW0gIT0gMSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgYWRkUHJvcGVydHkocHJvcElkLCBuZXcgQ1NTSW5oZXJpdGVkVmFsdWUoKSwgaW1w b3J0YW50KTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSBlbHNlIGlmIChpZCA9PSBDU1Nf VkFMX0lOSVRJQUwpIHsKKyAgICAgICAgaWYgKG51bSAhPSAxKQorICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgICAgICBhZGRQcm9wZXJ0eShwcm9wSWQsIG5ldyBDU1NJbml0aWFsVmFsdWUo KSwgaW1wb3J0YW50KTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMTk0LDYgKzIw MSw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZVNWR1ZhbHVlKGludCBwcm9wSWQKICAgICAgICAg ICAgIHZhbGlkX3ByaW1pdGl2ZSA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQorICAgICAgICAvKiBmYWxsdGhyb3VnaCBpbnRlbnRpb25hbCAqLwogICAgIGNhc2UgU1ZHQ1NT X1BST1BfR0xZUEhfT1JJRU5UQVRJT05fSE9SSVpPTlRBTDogLy8gPGFuZ2xlPiB8IGluaGVyaXQK ICAgICAgICAgaWYodmFsdWUtPnVuaXQgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19ERUcpCiAg ICAgICAgICAgICBwYXJzZWRWYWx1ZSA9IG5ldyBDU1NQcmltaXRpdmVWYWx1ZSh2YWx1ZS0+ZlZh bHVlLCBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX0RFRyk7CkBAIC0yNzEsMTQgKzI3OSw2IEBAIGJv b2wgQ1NTUGFyc2VyOjpwYXJzZVNWR1ZhbHVlKGludCBwcm9wSWQKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgdmFsaWRfcHJpbWl0aXZlID0gdmFsaWRVbml0KHZhbHVlLCBGTGVuZ3RoLCBmYWxz ZSk7CiAgICAgICAgIGJyZWFrOwotICAgIC8qIHNob3J0aGFuZCBwcm9wZXJ0aWVzICovCi0gICAg Y2FzZSBTVkdDU1NfUFJPUF9NQVJLRVI6Ci0gICAgewotICAgICAgICAgICAgY29uc3QgaW50IHBy b3BlcnRpZXNbM10gPSB7IFNWR0NTU19QUk9QX01BUktFUl9TVEFSVCwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBTVkdDU1NfUFJPUF9NQVJLRVJfTUlELAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFNWR0NTU19QUk9QX01BUktFUl9FTkQg fTsKLSAgICAgICAgICAgIHJldHVybiBwYXJzZVNob3J0aGFuZChwcm9wSWQsIHByb3BlcnRpZXMs IDMsIGltcG9ydGFudCk7Ci0gICAgfQogCiAgICAgY2FzZSBTVkdDU1NfUFJPUF9DTElQX1BBVEg6 ICAgIC8vIDx1cmk+IHwgbm9uZSB8IGluaGVyaXQKICAgICBjYXNlIFNWR0NTU19QUk9QX0ZJTFRF UjoKQEAgLTI5Miw2ICsyOTIsMTQgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlU1ZHVmFsdWUoaW50 IHByb3BJZAogICAgICAgICB9CiAgICAgICAgIGJyZWFrOwogCisgICAgLyogc2hvcnRoYW5kIHBy b3BlcnRpZXMgKi8KKyAgICBjYXNlIFNWR0NTU19QUk9QX01BUktFUjoKKyAgICB7CisgICAgICAg IGNvbnN0IGludCBwcm9wZXJ0aWVzWzNdID0geyBTVkdDU1NfUFJPUF9NQVJLRVJfU1RBUlQsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTVkdDU1NfUFJPUF9NQVJLRVJfTUlE LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgU1ZHQ1NTX1BST1BfTUFSS0VS X0VORCB9OworICAgICAgICByZXR1cm4gcGFyc2VTaG9ydGhhbmQocHJvcElkLCBwcm9wZXJ0aWVz LCAzLCBpbXBvcnRhbnQpOworICAgIH0KICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFs c2U7CiAgICAgfQpAQCAtMzA3LDE1ICszMTUsMTQgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlU1ZH VmFsdWUoaW50IHByb3BJZAogICAgICAgICBlbHNlIGlmKHZhbHVlLT51bml0ID49IEtET01DU1NW YWx1ZTo6UV9FTVMpCiAgICAgICAgICAgICBwYXJzZWRWYWx1ZSA9IG5ldyBDU1NRdWlya1ByaW1p dGl2ZVZhbHVlKHZhbHVlLT5mVmFsdWUsIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfRU1TKTsKICAg ICAgICAgdmFsdWVMaXN0LT5uZXh0KCk7Ci0gICAgICAgIGlmICh2YWx1ZUxpc3QtPmN1cnJlbnQo KSkgewotICAgICAgICAgICAgZGVsZXRlIHBhcnNlZFZhbHVlOwotICAgICAgICAgICAgcGFyc2Vk VmFsdWUgPSAwOwotICAgICAgICB9CiAgICAgfQogICAgIGlmKHBhcnNlZFZhbHVlKQogICAgIHsK LSAgICAgICAgYWRkUHJvcGVydHkocHJvcElkLCBwYXJzZWRWYWx1ZSwgaW1wb3J0YW50KTsKLSAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmICghdmFsdWVMaXN0LT5jdXJyZW50KCkgfHwg aW5TaG9ydGhhbmQoKSkgeworICAgICAgICAgICAgYWRkUHJvcGVydHkocHJvcElkLCBwYXJzZWRW YWx1ZSwgaW1wb3J0YW50KTsKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9Cisg ICAgICAgIGRlbGV0ZSBwYXJzZWRWYWx1ZTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwogfQo=