deon/openpgp-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unsafe use of array_pop

Browse Source
This commit is contained in:
Stephen Paul Weber 2013-01-20 17:41:37 -05:00
parent 825452e123
commit f4af8a010b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/openpgp.php
View File

@ -285,7 +285,8 @@ class OpenPGP_Packet {
return array($tag, 3, (($len - 192) << 8) + ord($input[2]) + 192); return array($tag, 3, (($len - 192) << 8) + ord($input[2]) + 192);
} }
if($len == 255) { // Five octet length if($len == 255) { // Five octet length
return array($tag, 6, array_pop(unpack('N', substr($input, 2, 4)))); $unpacked = unpack('N', substr($input, 2, 4));
return array($tag, 6, array_pop($unpacked));
} }
// TODO: Partial body lengths. 1 << ($len & 0x1F) // TODO: Partial body lengths. 1 << ($len & 0x1F)
} }
@ -366,7 +367,7 @@ class OpenPGP_Packet {
*/ */
function read_unpacked($count, $format) { function read_unpacked($count, $format) {
$unpacked = unpack($format, $this->read_bytes($count)); $unpacked = unpack($format, $this->read_bytes($count));
return $unpacked[1]; return array_pop($unpacked);
} }
function read_byte() { function read_byte() {
@ -456,7 +457,8 @@ class OpenPGP_SignaturePacket extends OpenPGP_Packet {
$this->trailer = $this->body(true); $this->trailer = $this->body(true);
$signer = $signers[$this->key_algorithm_name()][$this->hash_algorithm_name()]; $signer = $signers[$this->key_algorithm_name()][$this->hash_algorithm_name()];
$this->data = call_user_func($signer, $this->data.$this->trailer); $this->data = call_user_func($signer, $this->data.$this->trailer);
$this->hash_head = array_pop(unpack('n', substr($this->data, 0, 2))); $unpacked = unpack('n', substr($this->data, 0, 2));
$this->hash_head = array_pop($unpacked);
} }
function read() { function read() {
@ -621,7 +623,8 @@ class OpenPGP_SignaturePacket extends OpenPGP_Packet {
} }
if($len == 255) { // Five octet length if($len == 255) { // Five octet length
$length_of_length = 5; $length_of_length = 5;
$len = array_pop(unpack('N', substr($input, 1, 4))); $unpacked = unpack('N', substr($input, 1, 4));
$len = array_pop($unpacked);
} }
$input = substr($input, $length_of_length); // Chop off length header $input = substr($input, $length_of_length); // Chop off length header
$tag = ord($input[0]); $tag = ord($input[0]);