octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-23 03:18:59 +00:00
Code Issues Releases Wiki Activity

Fix infinite loop trimming passwords with ( in them

Browse Source
This commit is contained in:
Jay Berkenbilt 2012-12-28 12:21:11 -05:00
parent 8f5de08c2a
commit 16a23368e7
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libqpdf/QPDF_encryption.cc
View File

@ -141,14 +141,20 @@ QPDF::trim_user_password(std::string& user_password)
return; return;
} }
char const* p = 0; char const* p1 = cstr;
while ((p = strchr(cstr, '\x28')) != 0) char const* p2 = 0;
while ((p2 = strchr(p1, '\x28')) != 0)
{ {
if (memcmp(p, padding_string, len - (p - cstr)) == 0) if (memcmp(p2, padding_string, len - (p2 - cstr)) == 0)
{ {
user_password = user_password.substr(0, p - cstr); user_password = user_password.substr(0, p2 - cstr);
return; return;
} }
else
{
QTC::TC("qpdf", "QPDF_encryption skip 0x28");
p1 = p2 + 1;
}
} }
} }

1
qpdf/qpdf.testcov
View File

@ -253,3 +253,4 @@ QPDFWriter skip ADBE 0
QPDFWriter remove existing Extensions 0 QPDFWriter remove existing Extensions 0
QPDFWriter skip Extensions 0 QPDFWriter skip Extensions 0
QPDFWriter preserve ADBE 0 QPDFWriter preserve ADBE 0
QPDF_encryption skip 0x28 0

17
qpdf/test_driver.cc
View File

@ -88,6 +88,23 @@ void runtest(int n, char const* filename1, char const* filename2)
// the test suite to see how the test is invoked to find the file // the test suite to see how the test is invoked to find the file
// that the test is supposed to operate on. // that the test is supposed to operate on.
if (n == 0)
{
// Throw in some random test cases that don't fit anywhere
// else. This is in addition to whatever else is going on in
// test 0.
// The code to trim user passwords looks for 0x28 (which is
// "(") since it marks the beginning of the padding. Exercise
// the code to make sure it skips over 0x28 characters that
// aren't part of padding.
std::string password(
"1234567890123456789012(45678\x28\xbf\x4e\x5e");
assert(password.length() == 32);
QPDF::trim_user_password(password);
assert(password == "1234567890123456789012(45678");
}
QPDF pdf; QPDF pdf;
PointerHolder<char> file_buf; PointerHolder<char> file_buf;
FILE* filep = 0; FILE* filep = 0;