MFH: r472726
www/waterfox: update to 56.2.1.19
- Apply some FF61 fixes
Changes: 79affc3bb9...ff88ad0b62
Approved by: ports-secteam blanket
This commit is contained in:
Jan Beich
parent
7202eb9d7f
commit
5cb7e97e35
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q2/; revision=472729
@ -1,8 +1,8 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= waterfox
|
||||
DISTVERSION= 56.2.0-53
|
||||
DISTVERSIONSUFFIX= -g79affc3bb939f
|
||||
DISTVERSION= 56.2.1-19
|
||||
DISTVERSIONSUFFIX= -gff88ad0b627dc
|
||||
CATEGORIES= www ipv6
|
||||
|
||||
MAINTAINER= jbeich@FreeBSD.org
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1527689655
|
||||
SHA256 (MrAlex94-Waterfox-56.2.0-53-g79affc3bb939f_GH0.tar.gz) = c5c8ffa4704c122905bef92a8df78d0ca957b0f231c15f8b2dd6bd6b6ae0a3c1
|
||||
SIZE (MrAlex94-Waterfox-56.2.0-53-g79affc3bb939f_GH0.tar.gz) = 395135433
|
||||
TIMESTAMP = 1529323760
|
||||
SHA256 (MrAlex94-Waterfox-56.2.1-19-gff88ad0b627dc_GH0.tar.gz) = f94cb6a907e287fd599cbd57dd2cabc0dd9a4747dd2ec38600db7709dcd1b04b
|
||||
SIZE (MrAlex94-Waterfox-56.2.1-19-gff88ad0b627dc_GH0.tar.gz) = 395126403
|
||||
|
||||
27
www/waterfox/files/patch-bug1464039
Normal file
27
www/waterfox/files/patch-bug1464039
Normal file
@ -0,0 +1,27 @@
|
||||
commit 0a234825c39a
|
||||
Author: Nicolas Silva <nsilva@mozilla.com>
|
||||
Date: Fri Jun 15 14:01:07 2018 -0700
|
||||
|
||||
Bug 1464039 - Reject some invalid transforms in qcms. r=mwoodrow, a=RyanVM
|
||||
|
||||
--HG--
|
||||
extra : source : dfcc5301e87235818394a46f80dc1c164c2ca4b3
|
||||
---
|
||||
gfx/qcms/chain.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git gfx/qcms/chain.c gfx/qcms/chain.c
|
||||
index e382fbe001422..2b0e707c443c4 100644
|
||||
--- gfx/qcms/chain.c
|
||||
+++ gfx/qcms/chain.c
|
||||
@@ -972,6 +972,10 @@ static float* qcms_modular_transform_data(struct qcms_modular_transform *transfo
|
||||
assert(0 && "Unsupported transform module");
|
||||
return NULL;
|
||||
}
|
||||
+ if (transform->grid_size <= 0) {
|
||||
+ assert(0 && "Invalid transform");
|
||||
+ return NULL;
|
||||
+ }
|
||||
transform->transform_module_fn(transform,src,dest,len);
|
||||
dest = src;
|
||||
src = new_src;
|
||||
135
www/waterfox/files/patch-bug1464063
Normal file
135
www/waterfox/files/patch-bug1464063
Normal file
@ -0,0 +1,135 @@
|
||||
commit ce24f85311af
|
||||
Author: Nils Ohlmeier [:drno] <drno@ohlmeier.org>
|
||||
Date: Wed Jun 13 14:29:20 2018 -0700
|
||||
|
||||
Bug 1464063 - Remove sdp_getchoosetok. r=bwc, a=RyanVM
|
||||
|
||||
--HG--
|
||||
extra : source : 87163f9d6bc7670d074512cf96062ea01193ffb2
|
||||
---
|
||||
media/webrtc/signaling/src/sdp/sipcc/sdp_private.h | 2 -
|
||||
media/webrtc/signaling/src/sdp/sipcc/sdp_token.c | 16 ++----
|
||||
media/webrtc/signaling/src/sdp/sipcc/sdp_utils.c | 63 ----------------------
|
||||
3 files changed, 5 insertions(+), 76 deletions(-)
|
||||
|
||||
diff --git media/webrtc/signaling/src/sdp/sipcc/sdp_private.h media/webrtc/signaling/src/sdp/sipcc/sdp_private.h
|
||||
index a98f4b119f693..3459b0c0eb48e 100644
|
||||
--- media/webrtc/signaling/src/sdp/sipcc/sdp_private.h
|
||||
+++ media/webrtc/signaling/src/sdp/sipcc/sdp_private.h
|
||||
@@ -347,8 +347,6 @@ extern uint32_t sdp_getnextnumtok(const char *str, const char **str_end,
|
||||
extern uint32_t sdp_getnextnumtok_or_null(const char *str, const char **str_end,
|
||||
const char *delim, tinybool *null_ind,
|
||||
sdp_result_e *result);
|
||||
-extern tinybool sdp_getchoosetok(const char *str, const char **str_end,
|
||||
- const char *delim, sdp_result_e *result);
|
||||
|
||||
extern
|
||||
tinybool verify_sdescriptions_mki(char *buf, char *mkiVal, uint16_t *mkiLen);
|
||||
diff --git media/webrtc/signaling/src/sdp/sipcc/sdp_token.c media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
|
||||
index b4ad1beee3f70..54c38f08cdac0 100644
|
||||
--- media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
|
||||
+++ media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
|
||||
@@ -1162,15 +1162,11 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, uint16_t level, const char *ptr)
|
||||
}
|
||||
port_ptr = port;
|
||||
for (i=0; i < SDP_MAX_PORT_PARAMS; i++) {
|
||||
- if (sdp_getchoosetok(port_ptr, &port_ptr, "/ \t", &result) == TRUE) {
|
||||
- num[i] = SDP_CHOOSE_PARAM;
|
||||
- } else {
|
||||
- num[i] = sdp_getnextnumtok(port_ptr, (const char **)&port_ptr,
|
||||
- "/ \t", &result);
|
||||
- if (result != SDP_SUCCESS) {
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
+ num[i] = sdp_getnextnumtok(port_ptr, (const char **)&port_ptr,
|
||||
+ "/ \t", &result);
|
||||
+ if (result != SDP_SUCCESS) {
|
||||
+ break;
|
||||
+ }
|
||||
num_port_params++;
|
||||
}
|
||||
|
||||
@@ -1401,8 +1397,6 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, uint16_t level, const char *ptr)
|
||||
return (SDP_INVALID_PARAMETER);
|
||||
}
|
||||
mca_p->sctp_fmt = SDP_SCTP_MEDIA_FMT_WEBRTC_DATACHANNEL;
|
||||
- } else if (sdp_getchoosetok(port_ptr, &port_ptr, "/ \t", &result)) {
|
||||
- sctp_port = SDP_CHOOSE_PARAM;
|
||||
} else {
|
||||
sctp_port = sdp_getnextnumtok(port_ptr, (const char **)&port_ptr,
|
||||
"/ \t", &result);
|
||||
diff --git media/webrtc/signaling/src/sdp/sipcc/sdp_utils.c media/webrtc/signaling/src/sdp/sipcc/sdp_utils.c
|
||||
index e4f1b2eaf0c75..4d46115574dc9 100644
|
||||
--- media/webrtc/signaling/src/sdp/sipcc/sdp_utils.c
|
||||
+++ media/webrtc/signaling/src/sdp/sipcc/sdp_utils.c
|
||||
@@ -432,69 +432,6 @@ uint32_t sdp_getnextnumtok (const char *str, const char **str_end,
|
||||
}
|
||||
|
||||
|
||||
-/* See if the next token in a string is the choose character. The delim
|
||||
- * characters are passed in as a param. The check also will not go past
|
||||
- * a new line char or the end of the string. Skip any delimiters before
|
||||
- * the token.
|
||||
- */
|
||||
-tinybool sdp_getchoosetok (const char *str, const char **str_end,
|
||||
- const char *delim, sdp_result_e *result)
|
||||
-{
|
||||
- const char *b;
|
||||
- int flag2moveon;
|
||||
-
|
||||
- if ((str == NULL) || (str_end == NULL)) {
|
||||
- *result = SDP_FAILURE;
|
||||
- return(FALSE);
|
||||
- }
|
||||
-
|
||||
- /* Locate front of token, skipping any delimiters */
|
||||
- for ( ; ((*str != '\0') && (*str != '\n') && (*str != '\r')); str++) {
|
||||
- flag2moveon = 1; /* Default to move on unless we find a delimiter */
|
||||
- for (b=delim; *b; b++) {
|
||||
- if (*str == *b) {
|
||||
- flag2moveon = 0;
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
- if( flag2moveon ) {
|
||||
- break; /* We're at the beginning of the token */
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* Make sure there's really a token present. */
|
||||
- if ((*str == '\0') || (*str == '\n') || (*str == '\r')) {
|
||||
- *result = SDP_FAILURE;
|
||||
- *str_end = (char *)str;
|
||||
- return(FALSE);
|
||||
- }
|
||||
-
|
||||
- /* See if the token is '$' followed by a delimiter char or end of str. */
|
||||
- if (*str == '$') {
|
||||
- str++;
|
||||
- if ((*str == '\0') || (*str == '\n') || (*str == '\r')) {
|
||||
- *result = SDP_SUCCESS;
|
||||
- /* skip the choose char in the string. */
|
||||
- *str_end = (char *)(str+1);
|
||||
- return(TRUE);
|
||||
- }
|
||||
- for (b=delim; *b; b++) {
|
||||
- if (*str == *b) {
|
||||
- *result = SDP_SUCCESS;
|
||||
- /* skip the choose char in the string. */
|
||||
- *str_end = (char *)(str+1);
|
||||
- return(TRUE);
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* If the token was not '$' followed by a delim, token is not choose */
|
||||
- *result = SDP_SUCCESS;
|
||||
- *str_end = (char *)str;
|
||||
- return(FALSE);
|
||||
-
|
||||
-}
|
||||
-
|
||||
/*
|
||||
* SDP Crypto Utility Functions.
|
||||
*
|
||||
Loading…
Reference in New Issue
Block a user