Attachment #68057 for bug #100143

View | Details | Raw Unified | Return to bug 100143
Collapse All | Expand All




#

PORTNAME=	libunrar
PORTVERSION=	3.60.b6
CATEGORIES=	archivers
MASTER_SITES=	http://files2.rarlab.com/rar/ \
		http://files3.rarlab.com/rar/ \
		http://files4.rarlab.com/rar/ \
		http://files5.rarlab.com/rar/ \
		http://files6.rarlab.com/rar/
DISTNAME=	unrarsrc-3.6.6

MAINTAINER=	samm@os2.kiev.ua
COMMENT=	Library to work with RAR archivies

Lines 1-3 Link Here

(-)/home/samm/tmp/libunrar/distinfo (-3 / +3 lines)
1	MD5 (unrarsrc-3.6.4.tar.gz) = 001602097819fdbe6aa3cf46af01d922	1	MD5 (unrarsrc-3.6.6.tar.gz) = 78d05f6a80626fe066fd2438b6fe2059
2	SHA256 (unrarsrc-3.6.4.tar.gz) = 625611fda1baec14f4fedffc2b8b8997caf6f3f360d843f6c1304a508a297e4a	2	SHA256 (unrarsrc-3.6.6.tar.gz) = 246b4e61d29b90a2e3c80c34fe59b789efe8a8d7f58087d2a7ad057313d34975
3	SIZE (unrarsrc-3.6.4.tar.gz) = 124913	3	SIZE (unrarsrc-3.6.6.tar.gz) = 125044




diff -ruN unrar.orig/dll.cpp unrar/dll.cpp
+++ dll.cpp
@@ -59,8 +59,8 @@
     }
     if (!Data->Arc.IsArchive(false))
     {
-      delete Data;
       r->OpenResult=Data->Cmd.DllError!=0 ? Data->Cmd.DllError:ERAR_BAD_ARCHIVE;
+      delete Data;
       return(NULL);
     }
     r->Flags=Data->Arc.NewMhd.Flags;
@@ -272,7 +272,9 @@
       strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
       Data->Cmd.Test=Operation!=RAR_EXTRACT;
       bool Repeat=false;
-      Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);
-
+      
+      if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false)
+        return (ERAR_UNKNOWN);
 
       while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD)
       {
         Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);

Return to bug 100143

Lines 6-19 Link Here

(-)/home/samm/tmp/libunrar/Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= libunrar	8	PORTNAME= libunrar
9	PORTVERSION= 3.60.b4	9	PORTVERSION= 3.60.b6
10	CATEGORIES= archivers	10	CATEGORIES= archivers
11	MASTER_SITES= http://files2.rarlab.com/rar/ \	11	MASTER_SITES= http://files2.rarlab.com/rar/ \
12	http://files3.rarlab.com/rar/ \	12	http://files3.rarlab.com/rar/ \
13	http://files4.rarlab.com/rar/ \	13	http://files4.rarlab.com/rar/ \
14	http://files5.rarlab.com/rar/ \	14	http://files5.rarlab.com/rar/ \
15	http://files6.rarlab.com/rar/	15	http://files6.rarlab.com/rar/
16	DISTNAME= unrarsrc-3.6.4	16	DISTNAME= unrarsrc-3.6.6
17		17
18	MAINTAINER= samm@os2.kiev.ua	18	MAINTAINER= samm@os2.kiev.ua
19	COMMENT= Library to work with RAR archivies	19	COMMENT= Library to work with RAR archivies

Lines 1-16 Link Here

(-)/home/samm/tmp/libunrar/files/patch-dll.cpp (-6 / +13 lines)
1	diff -ruN unrar.orig/dll.cpp unrar/dll.cpp	1	diff -ruN unrar.orig/dll.cpp unrar/dll.cpp
2	--- dll.cpp.orig 2005-08-03 20:34:30.000000000 +0400	2	+++ dll.cpp
3	+++ dll.cpp 2006-01-11 12:13:33.000000000 +0300	3	@@ -59,8 +59,8 @@
4	@@ -271,8 +271,10 @@	4	}
		5	if (!Data->Arc.IsArchive(false))
		6	{
		7	- delete Data;
		8	r->OpenResult=Data->Cmd.DllError!=0 ? Data->Cmd.DllError:ERAR_BAD_ARCHIVE;
		9	+ delete Data;
		10	return(NULL);
		11	}
		12	r->Flags=Data->Arc.NewMhd.Flags;
		13	@@ -272,7 +272,9 @@
5	strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");	14	strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
6	Data->Cmd.Test=Operation!=RAR_EXTRACT;	15	Data->Cmd.Test=Operation!=RAR_EXTRACT;
7	bool Repeat=false;	16	bool Repeat=false;
8	- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);	17	- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);
9	-
10	+	18	+
11	+ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false)	19	+ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false)
12	+ return (ERAR_UNKNOWN);	20	+ return (ERAR_UNKNOWN);
13	+	21
14	while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD)	22	while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD)
15	{	23	{
16	Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);