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

Fix a bug in the unrar module that was causing crashes in win64

Browse Source
This commit is contained in:
Kovid Goyal 2015-12-08 14:18:08 +05:30
parent 645f1d138f
commit 5e07f19848
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -340,31 +340,39 @@ RAR_current_item(RARArchive *self, PyObject *args) {
if (*(fh.FileNameW)) { if (*(fh.FileNameW)) {
filename = wchar_to_unicode(fh.FileNameW); filename = wchar_to_unicode(fh.FileNameW);
if (!filename) return NULL;
} else { } else {
Py_INCREF(filename); Py_INCREF(filename);
} }
PyObject *tret = PyDict_New();
PyObject *temp = NULL;
if(!tret) goto error;
if (!(temp = Py_BuildValue("s#", fh.FileName, fh.NameSize))) goto error;
if (PyDict_SetItemString(tret, "filename", temp) != 0) goto error;
Py_DECREF(temp); temp = NULL;
#define AVAL(name, code, val) {if (!(temp = Py_BuildValue(code, (val)))) goto error; if (PyDict_SetItemString(tret, name, temp) != 0) goto error; Py_DECREF(temp); temp = NULL;}
AVAL("arcname", "s", self->archive->FileName);
AVAL("filenamew", "N", filename);
AVAL("flags", "H", fh.Flags);
AVAL("pack_size", "I", fh.PackSize);
AVAL("pack_size_high", "I", fh.HighPackSize);
AVAL("unpack_size", "I", fh.UnpSize);
AVAL("unpack_size_high", "I", fh.HighUnpSize);
AVAL("host_os", "b", fh.HostOS);
AVAL("file_crc", "I", fh.FileCRC);
AVAL("file_time", "I", fh.FileTime);
AVAL("unpack_ver", "b", fh.UnpVer);
AVAL("method", "b", fh.Method);
AVAL("file_attr", "I", fh.FileAttr);
AVAL("is_directory", "O", (self->archive->IsArcDir()) ? Py_True : Py_False);
AVAL("is_symlink", "O", (IsLink(fh.FileAttr)) ? Py_True : Py_False);
AVAL("is_label", "O", (self->archive->IsArcLabel()) ? Py_True : Py_False);
AVAL("has_password", "O", ((fh.Flags & LHD_PASSWORD) != 0) ? Py_True : Py_False);
return Py_BuildValue("{s:s, s:s#, s:N, s:H, s:I, s:I, s:I, s:I, s:b, s:I, s:I, s:b, s:b, s:I, s:O, s:O, s:O, s:O}", return tret;
"arcname", self->archive->FileName error:
,"filename", fh.FileName, fh.NameSize Py_XDECREF(tret); Py_XDECREF(temp); Py_XDECREF(filename);
,"filenamew", filename return NULL;
,"flags", fh.Flags
,"pack_size", fh.PackSize
,"pack_size_high", fh.HighPackSize
,"unpack_size", fh.UnpSize
,"unpack_size_high", fh.HighUnpSize
,"host_os", fh.HostOS
,"file_crc", fh.FileCRC
,"file_time", fh.FileTime
,"unpack_ver", fh.UnpVer
,"method", fh.Method
,"file_attr", fh.FileAttr
,"is_directory", (self->archive->IsArcDir()) ? Py_True : Py_False
,"is_symlink", (IsLink(fh.FileAttr)) ? Py_True : Py_False
,"has_password", ((fh.Flags & LHD_PASSWORD) != 0) ? Py_True : Py_False
,"is_label", (self->archive->IsArcLabel()) ? Py_True : Py_False
);
} }
static File unrar_dummy_output = File(); static File unrar_dummy_output = File();