Macintosh-SW
/
tenfourfox
mirror of https://github.com/classilla/tenfourfox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#500: M1464063 M1464039 M1458048

This commit is contained in:
Cameron Kaiser 2018-06-21 16:29:20 -07:00
parent 8805e177b7
commit 582f5a0deb
6 changed files with 11 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/qcms/chain.c
View File

@ -972,6 +972,12 @@ static float* qcms_modular_transform_data(struct qcms_modular_transform *transfo
assert(0 && "Unsupported transform module");
return NULL;
}
if (transform->grid_size <= 0 &&
(transform_fn == qcms_transform_module_clut ||
transform_fn == qcms_transform_module_clut_only)) {
assert(0 && "Invalid transform");
return NULL;
}
transform->transform_module_fn(transform,src,dest,len);
dest = src;
src = new_src;

2
media/webrtc/signaling/src/sdp/sipcc/sdp_private.h
View File

@ -343,8 +343,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);

8
media/webrtc/signaling/src/sdp/sipcc/sdp_token.c
View File

@ -1164,15 +1164,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_port_params++;
}
@ -1398,9 +1394,7 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, uint16_t level, const char *ptr)
}
port_ptr = port;
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);
if (result != SDP_SUCCESS) {

63
media/webrtc/signaling/src/sdp/sipcc/sdp_utils.c
View File

@ -426,69 +426,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.
*

2
netwerk/sctp/src/netinet/sctp_auth.c
View File

@ -1525,6 +1525,8 @@ sctp_auth_get_cookie_params(struct sctp_tcb *stcb, struct mbuf *m,
if (p_random != NULL) {
keylen = sizeof(*p_random) + random_len;
bcopy(p_random, new_key->key, keylen);
} else {
keylen = 0;
}
/* append in the AUTH chunks */
if (chunks != NULL) {

2
netwerk/sctp/src/netinet/sctp_pcb.c
View File

@ -7688,6 +7688,8 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
if (p_random != NULL) {
keylen = sizeof(*p_random) + random_len;
bcopy(p_random, new_key->key, keylen);
} else {
keylen = 0;
}
/* append in the AUTH chunks */
if (chunks != NULL) {