summaryrefslogtreecommitdiff
path: root/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch')
-rw-r--r--libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch
new file mode 100644
index 000000000..a1fa1f2ca
--- /dev/null
+++ b/libre/xarchiver-libre/xarchiver-0.5.2-segfault-password-protected.patch
@@ -0,0 +1,43 @@
+diff -Naur xarchiver-0.5.2.orig/src/window.c xarchiver-0.5.2/src/window.c
+--- xarchiver-0.5.2.orig/src/window.c 2014-01-24 08:10:09.305990000 +0100
++++ xarchiver-0.5.2/src/window.c 2014-01-24 08:42:45.110729290 +0100
+@@ -1694,7 +1694,7 @@
+ {
+ if (archive->passwd == NULL)
+ {
+- archive->passwd = xa_create_password_dialog(NULL);
++ archive->passwd = xa_create_password_dialog(archive);
+ if ( archive->passwd == NULL)
+ {
+ gtk_drag_finish (dc,FALSE,FALSE,t);
+@@ -2702,9 +2702,12 @@
+
+ if (entry->is_encrypted)
+ {
+- archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
+ if (archive[idx]->passwd == NULL)
+- return;
++ {
++ archive[idx]->passwd = xa_create_password_dialog(archive[idx]);
++ if (archive[idx]->passwd == NULL)
++ return;
++ }
+ }
+ filename = g_strconcat(archive[idx]->tmp,"/",entry->filename,NULL);
+ if (g_file_test(filename,G_FILE_TEST_EXISTS))
+@@ -2766,6 +2769,15 @@
+ /* The selected entry it's not a dir so extract it to the tmp dir and send it to xa_determine_program_to_run() */
+ else
+ {
++ if (entry->is_encrypted)
++ {
++ if (archive->passwd == NULL)
++ {
++ archive->passwd = xa_create_password_dialog(archive);
++ if (archive->passwd == NULL)
++ return;
++ }
++ }
+ if (archive->extraction_path)
+ {
+ dummy = g_strdup(archive->extraction_path);