tracking errant bin2hex call
This commit is contained in:
parent
fa1f2ce8f3
commit
028460a5c1
3 changed files with 9 additions and 4 deletions
5
boot.php
5
boot.php
|
@ -945,6 +945,11 @@ function unxmlify($s) {
|
||||||
|
|
||||||
if(! function_exists('hex2bin')) {
|
if(! function_exists('hex2bin')) {
|
||||||
function hex2bin($s) {
|
function hex2bin($s) {
|
||||||
|
if(! ctype_xdigit($s)) {
|
||||||
|
logger('hex2bin: illegal input: ' . print_r(debug_backtrace(), true));
|
||||||
|
return($s);
|
||||||
|
}
|
||||||
|
|
||||||
return(pack("H*",$s));
|
return(pack("H*",$s));
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
|
|
@ -788,8 +788,8 @@ function dfrn_deliver($owner,$contact,$atom) {
|
||||||
return (($res->status) ? $res->status : 3);
|
return (($res->status) ? $res->status : 3);
|
||||||
|
|
||||||
$postvars = array();
|
$postvars = array();
|
||||||
$sent_dfrn_id = hex2bin($res->dfrn_id);
|
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
|
||||||
$challenge = hex2bin($res->challenge);
|
$challenge = hex2bin((string) $res->challenge);
|
||||||
$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
|
$rino_allowed = ((intval($res->rino) === 1) ? 1 : 0);
|
||||||
|
|
||||||
$final_dfrn_id = '';
|
$final_dfrn_id = '';
|
||||||
|
|
|
@ -186,8 +186,8 @@
|
||||||
|
|
||||||
$postvars = array();
|
$postvars = array();
|
||||||
|
|
||||||
$sent_dfrn_id = hex2bin($res->dfrn_id);
|
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
|
||||||
$challenge = hex2bin($res->challenge);
|
$challenge = hex2bin((string) $res->challenge);
|
||||||
|
|
||||||
$final_dfrn_id = '';
|
$final_dfrn_id = '';
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue