Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Better error message when trying to extract a password protected item from a rar archive

Browse Source
This commit is contained in:
Kovid Goyal 2012-11-26 15:03:43 +05:30
parent a9ae5619ee
commit 78d4515e63
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/utils/unrar.cpp
View File

@ -373,6 +373,10 @@ RAR_process_item(RARArchive *self, PyObject *args) {
self->file_count++; self->file_count++;
try { try {
if (PyObject_IsTrue(extract)) { if (PyObject_IsTrue(extract)) {
if ((self->archive->NewLhd.Flags & LHD_PASSWORD) != 0) {
PyErr_SetString(UNRARError, "This file is locked with a password.");
return NULL;
}
self->DataIO.UnpVolume = false; self->DataIO.UnpVolume = false;
self->DataIO.NextVolumeMissing=false; self->DataIO.NextVolumeMissing=false;
self->DataIO.CurUnpRead=0; self->DataIO.CurUnpRead=0;
@ -421,7 +425,7 @@ RAR_process_item(RARArchive *self, PyObject *args) {
bool ValidCRC = (self->archive->OldFormat && GET_UINT32(self->DataIO.UnpFileCRC)==GET_UINT32(self->archive->NewLhd.FileCRC)) || bool ValidCRC = (self->archive->OldFormat && GET_UINT32(self->DataIO.UnpFileCRC)==GET_UINT32(self->archive->NewLhd.FileCRC)) ||
(!self->archive->OldFormat && GET_UINT32(self->DataIO.UnpFileCRC)==GET_UINT32(self->archive->NewLhd.FileCRC^0xffffffff)); (!self->archive->OldFormat && GET_UINT32(self->DataIO.UnpFileCRC)==GET_UINT32(self->archive->NewLhd.FileCRC^0xffffffff));
if (!ValidCRC) { if (!ValidCRC) {
PyErr_SetString(UNRARError, "Invalid CRC while extracting item"); PyErr_SetString(UNRARError, "Invalid CRC for item");
return NULL; return NULL;
} }
// Comes from ProcessFile in dll.cpp // Comes from ProcessFile in dll.cpp