[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:34:09 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit abb70f04ef606a9fd57447c03491ce138a78df03
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Apr 12 22:19:23 2004 +0000
Reviewed by John.
- fix deployment build by avoiding deployment-only warning.
* kjs/scope_chain.cpp:
(KJS::ScopeChain::bottom):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7201d9c..6f9ebfc 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,15 @@
Reviewed by John.
+ - fix deployment build by avoiding deployment-only warning.
+
+ * kjs/scope_chain.cpp:
+ (KJS::ScopeChain::bottom):
+
+2004-04-09 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
Changed things so that newly created objects get a prototype based
on the scope chain of the current function, rather than the
interpreter that started execution. This fixes the following bugs:
diff --git a/JavaScriptCore/kjs/scope_chain.cpp b/JavaScriptCore/kjs/scope_chain.cpp
index 88f7f74..0fec3f4 100644
--- a/JavaScriptCore/kjs/scope_chain.cpp
+++ b/JavaScriptCore/kjs/scope_chain.cpp
@@ -86,12 +86,16 @@ void ScopeChain::mark()
ObjectImp *ScopeChain::bottom() const
{
- ScopeChainNode *last;
+ ScopeChainNode *last = 0;
for (ScopeChainNode *n = _node; n; n = n->next) {
if (!n->next) {
last = n;
}
}
+ if (!last) {
+ return 0;
+ }
+
return last->object;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list