summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2010-01-16 18:47:12 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2010-01-16 18:47:12 +0000
commit24bb653b12d939cb4c3b6598ad0b793e5f5399ff (patch)
treea352aff638f1a068c04d0eef4778e1ba93bf9db6
parent5eb918a3ae80744907ee8ea2dc8cf7460f973dfb (diff)
downloadrdiff-backup-24bb653b12d939cb4c3b6598ad0b793e5f5399ff.tar.gz
Fix OverflowError on 64-bit systems when backing up symlinks with uid or gidr1-2
above INT_MAX. This fix is the same as r77008 in the Python source. git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-2@1060 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG3
-rw-r--r--rdiff-backup/rdiff_backup/cmodule.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 2cc6181..7a4db0b 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,9 @@
New in v1.2.9 (????/??/??)
---------------------------
+Fix OverflowError on 64-bit systems when backing up symlinks with uid or gid
+above INT_MAX. Thanks to Michel Le Cocq for the bug report. (Andrew Ferguson)
+
Don't print "Fatal Error" if --check-destination-dir completed successfully.
Thanks to Serge Zub for the suggestion. (Andrew Ferguson)
diff --git a/rdiff-backup/rdiff_backup/cmodule.c b/rdiff-backup/rdiff_backup/cmodule.c
index ed82ed4..ea3f129 100644
--- a/rdiff-backup/rdiff_backup/cmodule.c
+++ b/rdiff-backup/rdiff_backup/cmodule.c
@@ -394,9 +394,9 @@ static PyObject *
posix_lchown(PyObject *self, PyObject *args)
{
char *path = NULL;
- int uid, gid;
+ long uid, gid;
int res;
- if (!PyArg_ParseTuple(args, "etii:lchown",
+ if (!PyArg_ParseTuple(args, "etll:lchown",
Py_FileSystemDefaultEncoding, &path,
&uid, &gid))
return NULL;