sci-chemistry/mosflm: Fix Buffer overflow, #421843

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

2 files changed, 45 insertions, 0 deletions

diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch b/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch
new file mode 100644
index 000000000000..90158eb458d5
--- /dev/null
+++ b/sci-chemistry/mosflm/files/mosflm-7.0.7-buffer-overflow.patch
@@ -0,0 +1,16 @@
+ mosflm/pilatus_c.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mosflm/pilatus_c.c b/mosflm/pilatus_c.c
+index 1eaae26..cce5a02 100644
+--- a/mosflm/pilatus_c.c
++++ b/mosflm/pilatus_c.c
+@@ -34,7 +34,7 @@ delete them later */
+   int cbf_int[16];
+   long cbf_int4[16];
+   double cbf_double[16];
+-  char cbf_char[16][24];
++  char cbf_char[16][32];
+   /* temporary from cbfwrap.c - pilatus doesn't have these, so we'll 
+ delete them later */
+   int id, index, iindex;
diff --git a/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch b/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch
new file mode 100644
index 000000000000..32f251f8e00c
--- /dev/null
+++ b/sci-chemistry/mosflm/files/mosflm-7.0.7-impl-dec.patch
@@ -0,0 +1,29 @@
+ mosflm/mosflm_jpeg.c           |    1 +
+ src/dps/index/ind_gen_direct.c |    2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/mosflm/mosflm_jpeg.c b/mosflm/mosflm_jpeg.c
+index 2b32b2e..54684d0 100644
+--- a/mosflm/mosflm_jpeg.c
++++ b/mosflm/mosflm_jpeg.c
+@@ -76,6 +76,7 @@ G. Winter
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #if (defined _MSC_VER) 
+ /* no need to do this for __MINGW_ (Mingw gcc) this is just about unique!*/
+ #define S_IRWXU S_IREAD|S_IWRITE|S_IEXEC
+diff --git a/src/dps/index/ind_gen_direct.c b/src/dps/index/ind_gen_direct.c
+index 6e143df..2eea61b 100644
+--- a/src/dps/index/ind_gen_direct.c
++++ b/src/dps/index/ind_gen_direct.c
+@@ -41,6 +41,8 @@
+ /* #include <malloc.h> */
+ #include "util.h"
+ #include "ind_gen_direct.h"
++#include "ind_help.h"
++#include "ind_sort_merge.h"
+ /* char *strcat( char *, const char *); */
+ 
+