Skip to content
Browse files

Merge branch 'unrar', with unrar 4.2.4.

Conflicts:
	unrar/dll.rc
	unrar/version.hpp
  • Loading branch information...
2 parents 63d3b18 + e2c046d commit 430a8ba7638eb35f8a786476c66ecb3668fe6690 @cataphract committed Dec 16, 2012
Showing with 5 additions and 8 deletions.
  1. +2 −5 unrar/secpassword.cpp
  2. +3 −3 unrar/version.hpp
View
7 unrar/secpassword.cpp
@@ -82,11 +82,8 @@ void cleandata(void *data,size_t size)
// 'volatile' is required. Otherwise optimizers can remove this function
// if cleaning local variables, which are not used after that.
volatile byte *d = (volatile byte *)data;
- while (size>0)
- {
- *d=0;
- size--;
- }
+ for (size_t i=0;i<size;i++)
+ d[i]=0;
#endif
}
View
6 unrar/version.hpp
@@ -1,7 +1,7 @@
#define RARVER_MAJOR 4
#define RARVER_MINOR 20
-#define RARVER_BETA 3
+#define RARVER_BETA 0
#define RARVER_PATCH 1
-#define RARVER_DAY 28
-#define RARVER_MONTH 7
+#define RARVER_DAY 16
+#define RARVER_MONTH 12
#define RARVER_YEAR 2012

0 comments on commit 430a8ba

Please sign in to comment.
Something went wrong with that request. Please try again.