head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2011.02.10.18.26.35;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2011.01.25.18.38.16;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 1.2.7
changes:
-fix some security problems (CVE-2010-4492, CVE-2010-4493, CVE-2011-0482,
 CVE-2010-4199, CVE-2010-4578)
-fix some crashes (which were partly patched in pkgsrc before)
@
text
@$NetBSD: patch-be,v 1.1 2011/01/25 18:38:16 drochner Exp $

--- JavaScriptCore/interpreter/Interpreter.cpp.orig	2010-12-28 12:24:33.000000000 +0000
+++ JavaScriptCore/interpreter/Interpreter.cpp
@@@@ -3465,17 +3465,17 @@@@ skip_id_custom_self:
                 goto vm_throw;
             }
             ASSERT(!callFrame->callee()->isHostFunction());
-            uint32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount();
-            uint32_t inplaceArgs = min(argCount, expectedParams);
-            uint32_t i = 0;
+	    int32_t expectedParams = callFrame->callee()->jsExecutable()->parameterCount();
+	    int32_t inplaceArgs = min(static_cast<int32_t> (argCount), expectedParams);
+	    int32_t i = 0;
             Register* argStore = callFrame->registers() + argsOffset;
 
             // First step is to copy the "expected" parameters from their normal location relative to the callframe
             for (; i < inplaceArgs; i++)
                 argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams];
             // Then we copy any additional arguments that may be further up the stack ('-1' to account for 'this')
-            for (; i < argCount; i++)
-                argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams - argCount - 1];
+            for (; i < static_cast<int32_t> (argCount); i++)
+                argStore[i] = callFrame->registers()[i - RegisterFile::CallFrameHeaderSize - expectedParams - static_cast<int32_t> (argCount) - 1];
         } else if (!arguments.isUndefinedOrNull()) {
             if (!arguments.isObject()) {
                 exceptionValue = createInvalidParamError(callFrame, "Function.prototype.apply", arguments, vPC - callFrame->codeBlock()->instructions().begin(), callFrame->codeBlock());
@


1.1
log
@-fix the png-1.5 API problem using a new function introduced in beta08
 which is simpler and more runtime efficient
-pull in some stability patches from upstream
bump PKGREV
@
text
@d1 1
a1 1
$NetBSD$
@