<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164439] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164439">164439</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-20 11:40:04 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dynamically generated JSExport protocols added to a class results in a crash
https://bugs.webkit.org/show_bug.cgi?id=129108
Reviewed by Oliver Hunt.
We're not getting any information from the runtime about the types of the methods on
these protocols because they didn't exist at compile time. We should handle this gracefully.
* API/ObjCCallbackFunction.mm:
(objCCallbackFunctionForInvocation):
* API/tests/JSExportTests.mm:
(+[JSExportTests exportDynamicallyGeneratedProtocolTest]):
(runJSExportTests):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm">trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPItestsJSExportTestsmm">trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIObjCCallbackFunctionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm (164438 => 164439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2014-02-20 19:31:02 UTC (rev 164438)
+++ trunk/Source/JavaScriptCore/API/ObjCCallbackFunction.mm 2014-02-20 19:40:04 UTC (rev 164439)
</span><span class="lines">@@ -632,6 +632,9 @@
</span><span class="cx">
</span><span class="cx"> static JSObjectRef objCCallbackFunctionForInvocation(JSContext *context, NSInvocation *invocation, CallbackType type, Class instanceClass, const char* signatureWithObjcClasses)
</span><span class="cx"> {
</span><ins>+ if (!signatureWithObjcClasses)
+ return nil;
+
</ins><span class="cx"> const char* position = signatureWithObjcClasses;
</span><span class="cx">
</span><span class="cx"> OwnPtr<CallbackResult> result = adoptPtr(parseObjCType<ResultTypeDelegate>(position));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPItestsJSExportTestsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm (164438 => 164439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm 2014-02-20 19:31:02 UTC (rev 164438)
+++ trunk/Source/JavaScriptCore/API/tests/JSExportTests.mm 2014-02-20 19:40:04 UTC (rev 164439)
</span><span class="lines">@@ -25,6 +25,9 @@
</span><span class="cx">
</span><span class="cx"> #import "JSExportTests.h"
</span><span class="cx">
</span><ins>+#import <objc/runtime.h>
+#import <objc/objc.h>
+
</ins><span class="cx"> #if JSC_OBJC_API_ENABLED
</span><span class="cx">
</span><span class="cx"> extern "C" void checkResult(NSString *description, bool passed);
</span><span class="lines">@@ -32,6 +35,7 @@
</span><span class="cx"> @interface JSExportTests : NSObject
</span><span class="cx"> + (void) exportInstanceMethodWithIdProtocolTest;
</span><span class="cx"> + (void) exportInstanceMethodWithClassProtocolTest;
</span><ins>++ (void) exportDynamicallyGeneratedProtocolTest;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @protocol TruthTeller
</span><span class="lines">@@ -100,6 +104,25 @@
</span><span class="cx"> [context evaluateScript:@"makeTestObject().methodWithClassProtocol(opaqueObject);"];
</span><span class="cx"> checkResult(@"Successfully exported instance method", !context.exception);
</span><span class="cx"> }
</span><ins>+
++ (void) exportDynamicallyGeneratedProtocolTest
+{
+ JSContext *context = [[JSContext alloc] init];
+ Protocol *dynProtocol = objc_allocateProtocol("NSStringJSExport");
+ Protocol *jsExportProtocol = @protocol(JSExport);
+ protocol_addProtocol(dynProtocol, jsExportProtocol);
+ Method method = class_getInstanceMethod([NSString class], @selector(boolValue));
+ protocol_addMethodDescription(dynProtocol, @selector(boolValue), method_getTypeEncoding(method), YES, YES);
+ NSLog(@"type encoding = %s", method_getTypeEncoding(method));
+ protocol_addMethodDescription(dynProtocol, @selector(boolValue), "B@:", YES, YES);
+ objc_registerProtocol(dynProtocol);
+ class_addProtocol([NSString class], dynProtocol);
+
+ context[@"NSString"] = [NSString class];
+ context[@"myString"] = @"YES";
+ JSValue *value = [context evaluateScript:@"myString.boolValue()"];
+ checkResult(@"Dynamically generated JSExport-ed protocols are ignored", [value isUndefined] && !!context.exception);
+}
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> void runJSExportTests()
</span><span class="lines">@@ -107,6 +130,7 @@
</span><span class="cx"> @autoreleasepool {
</span><span class="cx"> [JSExportTests exportInstanceMethodWithIdProtocolTest];
</span><span class="cx"> [JSExportTests exportInstanceMethodWithClassProtocolTest];
</span><ins>+ [JSExportTests exportDynamicallyGeneratedProtocolTest];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164438 => 164439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-20 19:31:02 UTC (rev 164438)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-20 19:40:04 UTC (rev 164439)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-20 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Dynamically generated JSExport protocols added to a class results in a crash
+ https://bugs.webkit.org/show_bug.cgi?id=129108
+
+ Reviewed by Oliver Hunt.
+
+ We're not getting any information from the runtime about the types of the methods on
+ these protocols because they didn't exist at compile time. We should handle this gracefully.
+
+ * API/ObjCCallbackFunction.mm:
+ (objCCallbackFunctionForInvocation):
+ * API/tests/JSExportTests.mm:
+ (+[JSExportTests exportDynamicallyGeneratedProtocolTest]):
+ (runJSExportTests):
+
</ins><span class="cx"> 2014-02-20 Gabor Rapcsanyi <rgabor@webkit.org>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: isUInt16() on ARMv7 after r113253.
</span></span></pre>
</div>
</div>
</body>
</html>