9902 2006-07-13 18:10:36 -0700 jsNull and NSNull not properly converted between JS and ObjC 2016-08-04 15:14:03 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 420+ Mac OS X 10.4 RESOLVED WONTFIX P2 Normal --- 1 waylonis webkit-unassigned abob andersca barraclough darin ddkilzer emacemac7 ggaren oldest_to_newest 49693 0 waylonis 2006-07-13 18:10:36 -0700 Hi, I'm working for Google on a WebKit plugin. I've found that JS code with a "null" value will be converted to [WebUndefined undefined] when sent to a WebKit plug-in, and that there is no way to return a JS "null" from the plug-in (returning nil results in a JS "undefined" value). The documentation (http://developer.apple.com/documentation/Cocoa/Conceptual/DisplayWebContent/Tasks/JavaScriptFromObjC.html) states that NSNull will be converted to/from JS's null. A very straightforward fix for this would be to add these lines: objc_utility.mm:convertObjcValueToValue:(line 236) } else if ([*obj isKindOfClass:[NSNull class]]) { aValue = jsNull(); WebScriptObject.mm:_convertValueToObjcValue:(line 436) else if (value->isNull()) // JS Null -> NSNull return [NSNull null]; I came across this bug when I found that invokeUndefinedMethodFromWebScript:withArgs: was not being called for JS code that had a null in the arguments. What happens is that inside of ObjcInstance::invokeMethod() the null is turned into a actual NULL (0x0) value, and when the code tries to add it to the objcArgs array, it throws an exception and the invocation never happens. The above code changes fix the discrepancy between the documentation and reality as well as fixes the bug that I just mentioned. Thanks, Dan 49705 1 ddkilzer 2006-07-13 21:18:20 -0700 Hi Dan, please post a patch for review.  You can use the WebKitTools/Scripts/svn-create-patch script create a patch for you to post to this bug: $ ./WebKitTools/Scripts/svn-create-patch JavaScriptCore > bug-9902.diff If you'd like to be really pro-active, create a ChangeLog entry before creating the patch above: $ ./WebKitTools/Scripts/prepare-ChangeLog JavaScriptCore You can learn more about coding styles and the process used to contribute code (patches) to WebKit on this web page: http://webkit.opendarwin.org/coding/contributing.html Thanks! 49824 2 9451 waylonis 2006-07-14 12:04:45 -0700 Created attachment 9451 Patch to fix JSnull <-> NSNull 49886 3 9451 darin 2006-07-14 19:43:23 -0700 Comment on attachment 9451 Patch to fix JSnull <-> NSNull Patch looks great. We don't want that "GOOGLE Change" comment in there, though. And the closing parenthesis is missing from this line: +    // Other types (UnspecifiedType converted to 0. Ideally we also need to come up with a test for this. 50202 4 9530 waylonis 2006-07-17 14:59:36 -0700 Created attachment 9530 Revised changes for 9902 Changes as suggested by Darin 50210 5 9530 darin 2006-07-17 15:45:18 -0700 Comment on attachment 9530 Revised changes for 9902 Patch looks great! All we need is a layout test, and a change log entry, and we're ready to go. 50211 6 ddkilzer 2006-07-17 15:58:32 -0700 (In reply to comment #5) > Patch looks great! All we need is a layout test, and a change log entry, and > we're ready to go. Because this bug deals with the ObjC<->JavaScript bindings, a normal layout test (which tests the behavior of the browser using "normal" HTML and JavaScript) is not possible. However, I think there is a (relatively) new feature of DumpRenderTree (the testing harness application WebKit uses to run layout tests) that allows you to call ObjC methods from within JavaScript. I'm not real familiar with how to do this, though. I would start by looking in the LayoutTests/plugins/ directory for any test with "objc" in the name. 50214 7 9533 waylonis 2006-07-17 16:09:53 -0700 Created attachment 9533 Changelog patch 50216 8 9533 darin 2006-07-17 16:51:31 -0700 Comment on attachment 9533 Changelog patch Please don't use a separate patch for ChangeLog. We use single patches that include ChangeLog, code changes, and test cases. Also, this has tab characters in it. We don't use tab characters, and we have Subversion configured so it won't allow check-ins of files with tab characters in them. Also, it's best if the change has comments explaining the individual changes in addition to the bug URL, although some are better than others at adhering to this. 50222 9 9535 waylonis 2006-07-17 17:11:22 -0700 Created attachment 9535 Revised changes for 9902 I've removed the tabs and added comments to the change long. I also modified the DumpRenderTree code to include a method called "echo" which will take an object and return it. I modified LayoutTests/plugins/bindings-test.html and LayoutTests/plugins/bindings-test-expected.txt to test that objects are properly round-tripped between JS and ObjC. 50302 10 darin 2006-07-18 14:05:47 -0700 Wow, I'm really curious about how this bug affects Google! 50439 11 9535 ddkilzer 2006-07-20 07:13:38 -0700 Comment on attachment 9535 Revised changes for 9902 I think Attachment 9535 needed its review flag set. 50446 12 9535 darin 2006-07-20 09:35:34 -0700 Comment on attachment 9535 Revised changes for 9902 r=me ChangeLog needs a tiny bit of work. Whoever lands this should take care of that. 50671 13 ap 2006-07-24 09:56:04 -0700 I attempted to land, but this patch has already bit-rotted (WebScriptObject.mm moved to WebCore, and WebScriptObject.h now has a split personality). We maintain a separate ChangeLog in each subproject, so a patch should ideally provide them all. 50741 14 darin 2006-07-24 21:59:08 -0700 I fixed up this patch and landed it. Committed revision 15618. 54238 15 timothy 2006-08-30 10:12:02 -0700 This patch caused a couple of regressions. It seems application and widget authors do not take into acount for NSNull being a return type, this is very unfortunate. <rdar://problem/4651318> <rdar://problem/4701626> One example of this in Dashboard causes the following exception. 2006-08-29 17:09:05.927 DashboardClient[24975] *** -[NSNull length]: selector not recognized [self = 0xa0801040] 54239 16 timothy 2006-08-30 10:12:45 -0700 Should we roll this out? 54240 17 darin 2006-08-30 10:17:47 -0700 (In reply to comment #16) > Should we roll this out? We probably need to -- I think we're stuck with both null and undefined turning into nil. We should correct the documentation instead. 54252 18 waylonis 2006-08-30 11:40:31 -0700 That's super unfortunate. It will definitely cause my project here to fail. How about adding a class method +(void)setUsesNSNullForNil:(BOOL)yn to the WebScriptObject class? The default behavior is the old behavior. If set to YES, then it functions as the documentation describes and the patch fixes. 54259 19 darin 2006-08-30 12:51:56 -0700 (In reply to comment #18) > How about adding a class method +(void)setUsesNSNullForNil:(BOOL)yn to the > WebScriptObject class? The default behavior is the old behavior. If set to > YES, then it functions as the documentation describes and the patch fixes. I don't think that will work. That would change behavior for everyone in the same process, which could include plug-ins and other clients of WebKit. 54276 20 waylonis 2006-08-30 14:47:58 -0700 That's true, but it wouldn't break existing Dashboard widgets, which I think were the bugs reported. Is there some way to make it specific to a particular instance of a plugin? Perhaps if the plugin responded to a selector +(BOOL)useNSNullForNil;? 54279 21 ddkilzer 2006-08-30 15:05:48 -0700 (In reply to comment #19) > (In reply to comment #18) > > How about adding a class method +(void)setUsesNSNullForNil:(BOOL)yn to the > > WebScriptObject class? The default behavior is the old behavior. If set to > > YES, then it functions as the documentation describes and the patch fixes. > > I don't think that will work. That would change behavior for everyone in the > same process, which could include plug-ins and other clients of WebKit. What about adding a new public API method that does the right thing and deprecating (and documenting) the old method? The implemention of the two methods could be refactored to remove duplicate code while maintaining both old and new behaviors. Reopening bug since it's apparent changes need to be made. 54280 22 darin 2006-08-30 15:06:22 -0700 (In reply to comment #20) > That's true, but it wouldn't break existing Dashboard widgets, which I think > were the bugs reported. It easily could break an existing Dashboard widget. Upcoming versions of Dashboard load multiple widgets in a single process, and if a widget loaded a plug-in that made this call, then it could break plug-ins in other widgets. We don't know that this issue is limited to Dashboard. It's true that the first trouble we found was in a Dashboard widget. > Is there some way to make it specific to a particular instance of a plugin? > Perhaps if the plugin responded to a selector +(BOOL)useNSNullForNil;? Could be -- I'm not sure how to get to the plug-in from inside the bindings code efficiently, but perhaps it could be done. Sounds challenging to me. 54281 23 9535 ddkilzer 2006-08-30 15:06:39 -0700 Comment on attachment 9535 Revised changes for 9902 Clearing review+ flag on Attachment 9535 after bug was reopened. See Comment #21. 54282 24 darin 2006-08-30 15:07:23 -0700 (In reply to comment #21) > What about adding a new public API method that does the right thing and > deprecating (and documenting) the old method? The implemention of the two > methods could be refactored to remove duplicate code while maintaining both old > and new behaviors. Might be a good approach. Lets figure out what methods are affected. 56580 25 waylonis 2006-09-26 18:08:09 -0700 I see that in the latest top of tree the WebScriptObject.mm:_convertValueToObjCValue:originExecutionContext:executionContext: method now no longer returns NSNull when converting a jsNull for compatibility reasons. It would be great if there was a way that the Plugin could indicate that it wants to receive NSNulls instead of 0 for jsNull conversion. Maybe some way of querying the plugin once and setting the Exec state to control the conversion? 56620 26 darin 2006-09-27 10:20:43 -0700 (In reply to comment #25) > It would be great if there was a way that the Plugin could indicate that it > wants to receive NSNulls instead of 0 for jsNull conversion. Maybe some way of > querying the plugin once and setting the Exec state to control the conversion? That sounds OK, or the thing mentioned in the thread leading to comment #24. 1217619 27 andersca 2016-08-04 15:14:03 -0700 We don't plan to modify the Objective-C bindings further. 9451 2006-07-14 12:04:45 -0700 2006-07-17 15:44:43 -0700 Patch to fix JSnull <-> NSNull bug-9902.diff text/plain 1791 waylonis SW5kZXg6IEphdmFTY3JpcHRDb3JlL2JpbmRpbmdzL29iamMvV2ViU2NyaXB0T2JqZWN0Lm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL2JpbmRpbmdzL29iamMvV2ViU2NyaXB0T2JqZWN0 Lm1tCShyZXZpc2lvbiAxNTQyOSkKKysrIEphdmFTY3JpcHRDb3JlL2JpbmRpbmdzL29iamMvV2Vi U2NyaXB0T2JqZWN0Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MzMsOCArNDMzLDExIEBAIHN0YXRp YyBMaXN0IGxpc3RGcm9tTlNBcnJheShFeGVjU3RhdGUgKmUKICAgICBlbHNlIGlmICh2YWx1ZS0+ aXNVbmRlZmluZWQoKSkKICAgICAgICAgLy8gSlMgVW5kZWZpbmVkIC0tPiBXZWJVbmRlZmluZWQK ICAgICAgICAgcmV0dXJuIFtXZWJVbmRlZmluZWQgdW5kZWZpbmVkXTsKLSAgICAKLSAgICAvLyBP dGhlciB0eXBlcyAoVW5zcGVjaWZpZWRUeXBlIGFuZCBOdWxsVHlwZSkgY29udmVydGVkIHRvIDAu CisgICAgZWxzZSBpZiAodmFsdWUtPmlzTnVsbCgpKQorICAgICAgICAvLyBKUyBOdWxsIC0+IE5T TnVsbAorICAgICAgICByZXR1cm4gW05TTnVsbCBudWxsXTsKKyAgCisgICAgLy8gT3RoZXIgdHlw ZXMgKFVuc3BlY2lmaWVkVHlwZSBjb252ZXJ0ZWQgdG8gMC4KICAgICByZXR1cm4gMDsKIH0KIApJ bmRleDogSmF2YVNjcmlwdENvcmUvYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxpdHkubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gSmF2YVNjcmlwdENvcmUvYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxpdHkubW0JKHJl dmlzaW9uIDE1NDI5KQorKysgSmF2YVNjcmlwdENvcmUvYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxp dHkubW0JKHdvcmtpbmcgY29weSkKQEAgLTkzLDYgKzkzLDcgQEAgYm9vbCBjb252ZXJ0SlNNZXRo b2ROYW1lVG9PYmpjKGNvbnN0IGNoYQogICAgIFN0cmluZyAgICAgICAgICBOU1N0cmluZwogICAg IHdyYXBwZXIgICAgICAgICBpZAogICAgIE9iamVjdCAgICAgICAgICBXZWJTY3JpcHRPYmplY3QK KyAgICBudWxsICAgICAgICAgICAgTlNOdWxsCiAgICAgW10sIG90aGVyICAgICAgIGV4Y2VwdGlv bgogCiAqLwpAQCAtMjMxLDcgKzIzMiwxMCBAQCBKU1ZhbHVlICpjb252ZXJ0T2JqY1ZhbHVlVG9W YWx1ZSAoRXhlY1N0CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChbKm9iaiBpc0tpbmRPZkNs YXNzOltXZWJTY3JpcHRPYmplY3QgY2xhc3NdXSkgewogICAgICAgICAgICAgICAgICAgICBXZWJT Y3JpcHRPYmplY3QgKmpzb2JqZWN0ID0gKFdlYlNjcmlwdE9iamVjdCAqKSpvYmo7CiAgICAgICAg ICAgICAgICAgICAgIGFWYWx1ZSA9IFtqc29iamVjdCBfaW1wXTsKLSAgICAgICAgICAgICAgICB9 IGVsc2UgaWYgKCpvYmogPT0gMCkgeworICAgICAgICAgICAgICAgICAgICAvLyBHT09HTEUgQ2hh bmdlCisgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChbKm9iaiBpc0tpbmRPZkNsYXNzOltOU051 bGwgY2xhc3NdXSkgeworICAgICAgICAgICAgICAgICAgYVZhbHVlID0ganNOdWxsKCk7CisgICAg ICAgICAgICAgICB9IGVsc2UgaWYgKCpvYmogPT0gMCkgewogICAgICAgICAgICAgICAgICAgICBy ZXR1cm4ganNVbmRlZmluZWQoKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewogCQkgICAgYVZh bHVlID0gSW5zdGFuY2U6OmNyZWF0ZVJ1bnRpbWVPYmplY3QoSW5zdGFuY2U6Ok9iamVjdGl2ZUNM YW5ndWFnZSwgKHZvaWQgKikqb2JqKTsK 9530 2006-07-17 14:59:36 -0700 2006-07-17 17:11:22 -0700 Revised changes for 9902 bug-9902b.diff text/plain 2683 waylonis SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDg4KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzw8PDw8PDwgLm1pbmUKKzIwMDYt MDctMTQgIHdheWxvbmlzICA8c2V0IEVNQUlMX0FERFJFU1MgZW52aXJvbm1lbnQgdmFyaWFibGU+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBiaW5k aW5ncy9vYmpjL1dlYlNjcmlwdE9iamVjdC5tbToKKyAgICAgICAgKCtbV2ViU2NyaXB0T2JqZWN0 IF9jb252ZXJ0VmFsdWVUb09iamNWYWx1ZTpvcmlnaW5FeGVjdXRpb25Db250ZXh0OmV4ZWN1dGlv bkNvbnRleHQ6XSk6CisgICAgICAgICogYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxpdHkubW06Cisg ICAgICAgIChLSlM6OkJpbmRpbmdzOjpjb252ZXJ0T2JqY1ZhbHVlVG9WYWx1ZSk6CisKKz09PT09 PT0KIDIwMDYtMDctMTcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAg ICogQVBJL0pTQmFzZS5oOiBGaXggY29tbWVudCBmb3JtYXR0aW5nIHdoZXJlIHRoaW5ncyB1c2Vk IHRvIGJlIGxpbmVkIHVwIGJ1dApAQCAtNDc1LDYgKzQ4Niw3IEBACiAgICAgICAgICogcGNyZS9w Y3JlX2NvbXBpbGUuYzogKHBjcmVfY29tcGlsZTIpOiBGaXhlZCBhIERQUklOVEYgc28gSSBjb3Vs ZCBjb21waWxlCiAgICAgICAgIHdpdGggREVCVUcgb24uCiAKKz4+Pj4+Pj4gLnIxNTQ4OAogMjAw Ni0wNy0xNCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJT IGJ5IE1hY2llai4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL2JpbmRpbmdzL29iamMvV2ViU2NyaXB0 T2JqZWN0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL2JpbmRpbmdzL29iamMvV2Vi U2NyaXB0T2JqZWN0Lm1tCShyZXZpc2lvbiAxNTQ4OCkKKysrIEphdmFTY3JpcHRDb3JlL2JpbmRp bmdzL29iamMvV2ViU2NyaXB0T2JqZWN0Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC00MzMsOCArNDMz LDExIEBAIHN0YXRpYyBMaXN0IGxpc3RGcm9tTlNBcnJheShFeGVjU3RhdGUgKmUKICAgICBlbHNl IGlmICh2YWx1ZS0+aXNVbmRlZmluZWQoKSkKICAgICAgICAgLy8gSlMgVW5kZWZpbmVkIC0tPiBX ZWJVbmRlZmluZWQKICAgICAgICAgcmV0dXJuIFtXZWJVbmRlZmluZWQgdW5kZWZpbmVkXTsKLSAg ICAKLSAgICAvLyBPdGhlciB0eXBlcyAoVW5zcGVjaWZpZWRUeXBlIGFuZCBOdWxsVHlwZSkgY29u dmVydGVkIHRvIDAuCisgICAgZWxzZSBpZiAodmFsdWUtPmlzTnVsbCgpKQorICAgICAgICAvLyBK UyBOdWxsIC0+IE5TTnVsbAorICAgICAgICByZXR1cm4gW05TTnVsbCBudWxsXTsKKyAgCisgICAg Ly8gT3RoZXIgdHlwZXMgKGUuZy4sIFVuc3BlY2lmaWVkVHlwZSkgY29udmVydGVkIHRvIDAuCiAg ICAgcmV0dXJuIDA7CiB9CiAKSW5kZXg6IEphdmFTY3JpcHRDb3JlL2JpbmRpbmdzL29iamMvb2Jq Y191dGlsaXR5Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL2JpbmRpbmdzL29iamMv b2JqY191dGlsaXR5Lm1tCShyZXZpc2lvbiAxNTQ4OCkKKysrIEphdmFTY3JpcHRDb3JlL2JpbmRp bmdzL29iamMvb2JqY191dGlsaXR5Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC05Myw2ICs5Myw3IEBA IGJvb2wgY29udmVydEpTTWV0aG9kTmFtZVRvT2JqYyhjb25zdCBjaGEKICAgICBTdHJpbmcgICAg ICAgICAgTlNTdHJpbmcKICAgICB3cmFwcGVyICAgICAgICAgaWQKICAgICBPYmplY3QgICAgICAg ICAgV2ViU2NyaXB0T2JqZWN0CisgICAgbnVsbCAgICAgICAgICAgIE5TTnVsbAogICAgIFtdLCBv dGhlciAgICAgICBleGNlcHRpb24KIAogKi8KQEAgLTIzMSw3ICsyMzIsOSBAQCBKU1ZhbHVlICpj b252ZXJ0T2JqY1ZhbHVlVG9WYWx1ZSAoRXhlY1N0CiAgICAgICAgICAgICAgICAgfSBlbHNlIGlm IChbKm9iaiBpc0tpbmRPZkNsYXNzOltXZWJTY3JpcHRPYmplY3QgY2xhc3NdXSkgewogICAgICAg ICAgICAgICAgICAgICBXZWJTY3JpcHRPYmplY3QgKmpzb2JqZWN0ID0gKFdlYlNjcmlwdE9iamVj dCAqKSpvYmo7CiAgICAgICAgICAgICAgICAgICAgIGFWYWx1ZSA9IFtqc29iamVjdCBfaW1wXTsK LSAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKCpvYmogPT0gMCkgeworICAgICAgICAgICAgICAg IH0gZWxzZSBpZiAoWypvYmogaXNLaW5kT2ZDbGFzczpbTlNOdWxsIGNsYXNzXV0pIHsKKyAgICAg ICAgICAgICAgICAgIGFWYWx1ZSA9IGpzTnVsbCgpOworICAgICAgICAgICAgICAgfSBlbHNlIGlm ICgqb2JqID09IDApIHsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7 CiAgICAgICAgICAgICAgICAgfSBlbHNlIHsKIAkJICAgIGFWYWx1ZSA9IEluc3RhbmNlOjpjcmVh dGVSdW50aW1lT2JqZWN0KEluc3RhbmNlOjpPYmplY3RpdmVDTGFuZ3VhZ2UsICh2b2lkICopKm9i aik7Cg== 9533 2006-07-17 16:09:53 -0700 2006-07-17 17:11:22 -0700 Changelog patch changelog9902.diff text/plain 734 waylonis SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDkxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDYtMDctMTcgIHdheWxvbmlz ICA8d2F5bG9uaXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKwkKKwlDaGFuZ2VzIHRvIGZpeDoKKwlodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5v cmcvc2hvd19idWcuY2dpP2lkPTk5MDIKKyAgICAgICAgKiBiaW5kaW5ncy9vYmpjL1dlYlNjcmlw dE9iamVjdC5tbToKKyAgICAgICAgKCtbV2ViU2NyaXB0T2JqZWN0IF9jb252ZXJ0VmFsdWVUb09i amNWYWx1ZTpvcmlnaW5FeGVjdXRpb25Db250ZXh0OmV4ZWN1dGlvbkNvbnRleHQ6XSk6CisgICAg ICAgICogYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxpdHkubW06CisgICAgICAgIChLSlM6OkJpbmRp bmdzOjpjb252ZXJ0T2JqY1ZhbHVlVG9WYWx1ZSk6CisKIDIwMDYtMDctMTcgIERhcmluIEFkbGVy ICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgICogQVBJL0pTQmFzZS5oOiBGaXggY29tbWVu dCBmb3JtYXR0aW5nIHdoZXJlIHRoaW5ncyB1c2VkIHRvIGJlIGxpbmVkIHVwIGJ1dAo= 9535 2006-07-17 17:11:22 -0700 2010-06-10 17:23:06 -0700 Revised changes for 9902 bug-9902c.diff text/plain 4970 waylonis SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDkxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDYtMDctMTcgIHdheWxvbmlz ICA8d2F5bG9uaXNAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKwkKKyAgICAgICAgQ2hhbmdlcyB0byBmaXg6CisgICAgICAgIGh0dHA6Ly9idWd6aWxs YS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTkwMgorICAgICAgICAqIGJpbmRpbmdz L29iamMvV2ViU2NyaXB0T2JqZWN0Lm1tOiBBZGQgY2FzZSBmb3IgY29udmVydGluZyBqc051bGwg dG8gTlNOdWxsCisgICAgICAgICgrW1dlYlNjcmlwdE9iamVjdCBfY29udmVydFZhbHVlVG9PYmpj VmFsdWU6b3JpZ2luRXhlY3V0aW9uQ29udGV4dDpleGVjdXRpb25Db250ZXh0Ol0pOgorICAgICAg ICAqIGJpbmRpbmdzL29iamMvb2JqY191dGlsaXR5Lm1tOiBBZGQgY2FzZSBmb3IgY29udmVydGlu ZyBOU051bGwgdG8ganNOdWxsCisgICAgICAgIChLSlM6OkJpbmRpbmdzOjpjb252ZXJ0T2JqY1Zh bHVlVG9WYWx1ZSk6CisKIDIwMDYtMDctMTcgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCiAgICAgICAgICogQVBJL0pTQmFzZS5oOiBGaXggY29tbWVudCBmb3JtYXR0aW5nIHdoZXJl IHRoaW5ncyB1c2VkIHRvIGJlIGxpbmVkIHVwIGJ1dApJbmRleDogSmF2YVNjcmlwdENvcmUvYmlu ZGluZ3Mvb2JqYy9XZWJTY3JpcHRPYmplY3QubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENv cmUvYmluZGluZ3Mvb2JqYy9XZWJTY3JpcHRPYmplY3QubW0JKHJldmlzaW9uIDE1NDg4KQorKysg SmF2YVNjcmlwdENvcmUvYmluZGluZ3Mvb2JqYy9XZWJTY3JpcHRPYmplY3QubW0JKHdvcmtpbmcg Y29weSkKQEAgLTQzMyw4ICs0MzMsMTEgQEAgc3RhdGljIExpc3QgbGlzdEZyb21OU0FycmF5KEV4 ZWNTdGF0ZSAqZQogICAgIGVsc2UgaWYgKHZhbHVlLT5pc1VuZGVmaW5lZCgpKQogICAgICAgICAv LyBKUyBVbmRlZmluZWQgLS0+IFdlYlVuZGVmaW5lZAogICAgICAgICByZXR1cm4gW1dlYlVuZGVm aW5lZCB1bmRlZmluZWRdOwotICAgIAotICAgIC8vIE90aGVyIHR5cGVzIChVbnNwZWNpZmllZFR5 cGUgYW5kIE51bGxUeXBlKSBjb252ZXJ0ZWQgdG8gMC4KKyAgICBlbHNlIGlmICh2YWx1ZS0+aXNO dWxsKCkpCisgICAgICAgIC8vIEpTIE51bGwgLT4gTlNOdWxsCisgICAgICAgIHJldHVybiBbTlNO dWxsIG51bGxdOworICAKKyAgICAvLyBPdGhlciB0eXBlcyAoZS5nLiwgVW5zcGVjaWZpZWRUeXBl KSBjb252ZXJ0ZWQgdG8gMC4KICAgICByZXR1cm4gMDsKIH0KIApJbmRleDogSmF2YVNjcmlwdENv cmUvYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxpdHkubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlw dENvcmUvYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxpdHkubW0JKHJldmlzaW9uIDE1NDg4KQorKysg SmF2YVNjcmlwdENvcmUvYmluZGluZ3Mvb2JqYy9vYmpjX3V0aWxpdHkubW0JKHdvcmtpbmcgY29w eSkKQEAgLTkzLDYgKzkzLDcgQEAgYm9vbCBjb252ZXJ0SlNNZXRob2ROYW1lVG9PYmpjKGNvbnN0 IGNoYQogICAgIFN0cmluZyAgICAgICAgICBOU1N0cmluZwogICAgIHdyYXBwZXIgICAgICAgICBp ZAogICAgIE9iamVjdCAgICAgICAgICBXZWJTY3JpcHRPYmplY3QKKyAgICBudWxsICAgICAgICAg ICAgTlNOdWxsCiAgICAgW10sIG90aGVyICAgICAgIGV4Y2VwdGlvbgogCiAqLwpAQCAtMjMxLDcg KzIzMiw5IEBAIEpTVmFsdWUgKmNvbnZlcnRPYmpjVmFsdWVUb1ZhbHVlIChFeGVjU3QKICAgICAg ICAgICAgICAgICB9IGVsc2UgaWYgKFsqb2JqIGlzS2luZE9mQ2xhc3M6W1dlYlNjcmlwdE9iamVj dCBjbGFzc11dKSB7CiAgICAgICAgICAgICAgICAgICAgIFdlYlNjcmlwdE9iamVjdCAqanNvYmpl Y3QgPSAoV2ViU2NyaXB0T2JqZWN0ICopKm9iajsKICAgICAgICAgICAgICAgICAgICAgYVZhbHVl ID0gW2pzb2JqZWN0IF9pbXBdOwotICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoKm9iaiA9PSAw KSB7CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChbKm9iaiBpc0tpbmRPZkNsYXNzOltOU051 bGwgY2xhc3NdXSkgeworICAgICAgICAgICAgICAgICAgYVZhbHVlID0ganNOdWxsKCk7CisgICAg ICAgICAgICAgICB9IGVsc2UgaWYgKCpvYmogPT0gMCkgewogICAgICAgICAgICAgICAgICAgICBy ZXR1cm4ganNVbmRlZmluZWQoKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewogCQkgICAgYVZh bHVlID0gSW5zdGFuY2U6OmNyZWF0ZVJ1bnRpbWVPYmplY3QoSW5zdGFuY2U6Ok9iamVjdGl2ZUNM YW5ndWFnZSwgKHZvaWQgKikqb2JqKTsKSW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvYmluZGlu Z3MtdGVzdC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGx1Z2lucy9i aW5kaW5ncy10ZXN0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMTU0ODgpCisrKyBMYXlvdXRUZXN0 cy9wbHVnaW5zL2JpbmRpbmdzLXRlc3QtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0y LDYgKzIsMTQgQEAgQUxFUlQ6IHR5cGVvZihvYmpDUGx1Z2luKT1vYmplY3QKIEFMRVJUOiBvYmpD UGx1Z2luKCk9VHlwZUVycm9yCiBBTEVSVDogdHlwZW9mKG9iakNQbHVnaW5GdW5jdGlvbik9ZnVu Y3Rpb24KIEFMRVJUOiBvYmpDUGx1Z2luRnVuY3Rpb24oKT10ZXN0CitBTEVSVDogaGVsbG8gPSBo ZWxsbyAoc2FtZSkKK0FMRVJUOiBzdHJpbmcgPSBzdHJpbmcgKHNhbWUpCitBTEVSVDogNDIgPSA0 MiAoc2FtZSkKK0FMRVJUOiBudW1iZXIgPSBudW1iZXIgKHNhbWUpCitBTEVSVDogbnVsbCA9IG51 bGwgKHNhbWUpCitBTEVSVDogb2JqZWN0ID0gb2JqZWN0IChzYW1lKQorQUxFUlQ6IG9uZSx0d28g PSBvbmUsdHdvIChzYW1lKQorQUxFUlQ6IG9iamVjdCA9IG9iamVjdCAoc2FtZSkKIEFMRVJUOiB0 eXBlb2YoY1BsdWdpbik9ZnVuY3Rpb24KIEFMRVJUOiBjUGx1Z2luKCk9MQogQUxFUlQ6IHR5cGVv ZihjUGx1Z2luKT1vYmplY3QKSW5kZXg6IExheW91dFRlc3RzL3BsdWdpbnMvYmluZGluZ3MtdGVz dC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsdWdpbnMvYmluZGluZ3MtdGVzdC5o dG1sCShyZXZpc2lvbiAxNTQ4OCkKKysrIExheW91dFRlc3RzL3BsdWdpbnMvYmluZGluZ3MtdGVz dC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiwyMSBAQCBmdW5jdGlvbiBkb1Rlc3Qo KQogICAgICAgICAgICAgcmVzdWx0ID0gZS5uYW1lOwogICAgICAgICB9CiAgICAgICAgIGFsZXJ0 KCJvYmpDUGx1Z2luRnVuY3Rpb24oKT0iICsgcmVzdWx0KTsKKworCQlmdW5jdGlvbiBlY2hvVGVz dChhcmcpIHsKKwkJCXZhciBlY2hvID0gb2JqQ1BsdWdpbi5lY2hvKGFyZyk7CisJCQl2YXIgc2Ft ZVZhbCA9IChhcmcgPT0gZWNobykgPyAic2FtZSIgOiAiZGlmZmVyZW50IjsKKwkJCXZhciBzYW1l VHlwZSA9ICh0eXBlb2YoYXJnKSA9PSB0eXBlb2YoZWNobykpID8gInNhbWUiIDogImRpZmZlcmVu dCI7CisJCQkKKwkJCWFsZXJ0KGFyZyArICIgPSAiICsgZWNobyArICIgKCIgKyBzYW1lVmFsICsg IikiKTsKKwkJCWFsZXJ0KHR5cGVvZihhcmcpICsgIiA9ICIgKyB0eXBlb2YoZWNobykgKyAiICgi ICsgc2FtZVR5cGUgKyAiKSIpOworCQl9CisgICAgICAgIAorICAgICAgICAvLyBUZXN0IHRoZSBl Y2hvIGZ1bmN0aW9uCisgICAgICAgIGVjaG9UZXN0KCJoZWxsbyIpOworICAgICAgICBlY2hvVGVz dCg0Mik7CisgICAgICAgIGVjaG9UZXN0KG51bGwpOworICAgICAgICBlY2hvVGVzdChuZXcgQXJy YXkoIm9uZSIsICJ0d28iKSk7CiAgICAgfQogICAgIAogICAgIC8vIFRlc3QgdGhlIEMgcGx1Z2lu CkluZGV4OiBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9PYmpDUGx1Z2luLm0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvT2JqQ1BsdWdpbi5tCShyZXZpc2lvbiAx NTQ4OCkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL09iakNQbHVnaW4ubQkod29ya2lu ZyBjb3B5KQpAQCAtMTM1LDExICsxMzUsMTggQEAgc3RhdGljIEJPT0wgX2FsbG93c1NjcmlwdHNG dWxsQWNjZXNzID0gTgogewogICAgIGlmIChhU2VsZWN0b3IgPT0gQHNlbGVjdG9yKHJlbW92ZUJy aWRnZVJlc3RyaWN0aW9uczopKQogICAgICAgICByZXR1cm4gTk87CisKKyAgICBpZiAoYVNlbGVj dG9yID09IEBzZWxlY3RvcihlY2hvOikpCisgICAgICAgIHJldHVybiBOTzsKKwogICAgIHJldHVy biBZRVM7CiB9CiAKICsgKE5TU3RyaW5nICopd2ViU2NyaXB0TmFtZUZvclNlbGVjdG9yOihTRUwp YVNlbGVjdG9yCiB7CisgICAgaWYgKGFTZWxlY3RvciA9PSBAc2VsZWN0b3IoZWNobzopKQorICAg ICAgICByZXR1cm4gQCJlY2hvIjsKKyAgCiAgICAgcmV0dXJuIG5pbDsKIH0KIApAQCAtMTU0LDQg KzE2MSw4IEBAIHN0YXRpYyBCT09MIF9hbGxvd3NTY3JpcHRzRnVsbEFjY2VzcyA9IE4KICAgICBb b2JqYyByZWxlYXNlXTsKIH0KIAorLSAoaWQpZWNobzooaWQpb2JqIHsKKyAgcmV0dXJuIG9iajsK K30KKwogQGVuZAo=