Attachment 178609 Details for Bug 215861 – Fix quote() failures

[patch] Fix quote() failures

sm170.quote_fail.diff (text/plain), 1.65 KB, created by Jan Beich on 2017-01-07 21:04:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-01-07 21:04:44 UTC

Size: 1.65 KB

patch

obsolete

>From 54b2dfde7f7d93bf5ec9ca934cdabe9a5025c104 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sat, 7 Jan 2017 20:40:47 +0000
>Subject: lang/spidermonkey170: unbreak with clang 4.0
>
>Fix quoting failure handling in JSOP_CALLPROP and JSOP_STRING.
>
>jsopcode.cpp:6070:45: error: ordered comparison between pointer and zero ('char *' and 'int')
>    return QuoteString(&sprinter, s, quote) >= 0;
>           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~
>
>PR:		215861
>Obtained from:	upstream
>Approved by:	portmgr blanket
>---
> lang/spidermonkey170/Makefile               |  2 +-
> lang/spidermonkey170/files/patch-bug1012971 | 11 +++++++++++
> 2 files changed, 12 insertions(+), 1 deletion(-)
> create mode 100644 lang/spidermonkey170/files/patch-bug1012971
>
>diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile
>index 904e35e3aca0..aad5bf4630d9 100644
>--- a/lang/spidermonkey170/Makefile
>+++ b/lang/spidermonkey170/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		spidermonkey170
> PORTVERSION=		17.0.0
>-PORTREVISION=		3
>+PORTREVISION=		4
> CATEGORIES=		lang
> MASTER_SITES=		MOZILLA/js
> DISTNAME=		mozjs${PORTVERSION}
>diff --git a/lang/spidermonkey170/files/patch-bug1012971 b/lang/spidermonkey170/files/patch-bug1012971
>new file mode 100644
>index 000000000000..0ed2157cf82e
>--- /dev/null
>+++ b/lang/spidermonkey170/files/patch-bug1012971
>@@ -0,0 +1,11 @@
>+--- jsopcode.cpp.orig	2013-02-11 22:33:23 UTC
>++++ jsopcode.cpp
>+@@ -6067,7 +6067,7 @@ ExpressionDecompiler::write(JSString *s)
>+ bool
>+ ExpressionDecompiler::quote(JSString *s, uint32_t quote)
>+ {
>+-    return QuoteString(&sprinter, s, quote) >= 0;
>++    return QuoteString(&sprinter, s, quote) != NULL;
>+ }
>+ 
>+ JSAtom *

Actions: View | Diff

Attachments on bug 215861: 178609