Skip to content

Fix/tnef content parsing #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martincivan merged 2 commits into from
Jun 6, 2023
Merged

Fix/tnef content parsing #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617d020
Fix TNEFFileRTF parsing
Jun 5, 2023
aa9c220
Fix nested TNEFAttachment parsing
Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/TNEFDecoder/TNEFAttachment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ function extract_mapi_attrs(TNEFBuffer $buffer)
case TNEF_MAPI_ATTACH_DATA:
if ($this->debug)
tnef_log("MAPI Found nested attachment. Processing new one.");
tnef_getx(16, $buffer); // skip the next 16 bytes (unknown data)
$value = substr($value, 16); // skip the next 16 bytes (unknown data)
$att = new TNEFAttachment($this->debug, $this->validateChecksum);
$att->decodeTnef($value);
$this->attachments[] = $att;
Expand Down
12 changes: 6 additions & 6 deletions src/TNEFDecoder/TNEFFileRTF.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,15 @@ function decode_crtf(TNEFBuffer $buffer)
if ($this->debug)
tnef_log("CRTF: size comp=$size_compressed, size=$this->size");

$data = tnef_getx($buffer->getRemainingBytes(), $buffer);

switch ($magic) {
case CRTF_COMPRESSED:
$this->uncompress($buffer);
$this->uncompress($data);
break;

case CRTF_UNCOMPRESSED:
$this->content = $buffer;
$this->content = $data;
break;

default:
Expand All @@ -61,10 +63,8 @@ function decode_crtf(TNEFBuffer $buffer)
}
}

function uncompress(TNEFBuffer $buffer)
function uncompress($data)
{
$data = tnef_getx($buffer->getRemainingBytes(), $buffer);

$preload = "{\\rtf1\\ansi\\mac\\deff0\\deftab720{\\fonttbl;}{\\f0\\fnil \\froman \\fswiss \\fmodern \\fscript \\fdecor MS Sans SerifSymbolArialTimes New RomanCourier{\\colortbl\\red0\\green0\\blue0\n\r\\par \\pard\\plain\\f0\\fs20\\b\\i\\u\\tab\\tx";
$length_preload = strlen($preload);
$init_dict = [];
Expand Down Expand Up @@ -110,7 +110,7 @@ function uncompress(TNEFBuffer $buffer)
}
}
}
$this->content = new TNEFBuffer(implode('', $output_buffer));
$this->content = implode('', $output_buffer);
}

}
Expand Down