[SCM] BOINC packaging branch, master, updated. debian/7.0.33+dfsg-1-26-g82e5dbd

Guo Yixuan culu.gyx at gmail.com
Sat Sep 1 11:48:38 UTC 2012


The following commit has been merged in the master branch:
commit 82e5dbd257fa111287ad57297dacaee62f500ada
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sat Sep 1 19:43:03 2012 +0800

    fix truncated shmem_name
    
    shmem_name is a pointer, pointing to a string of length MAXPATHLEN

diff --git a/debian/patches/more_maxpathlen.patch b/debian/patches/more_maxpathlen.patch
index 4a0346c..8ece46f 100644
--- a/debian/patches/more_maxpathlen.patch
+++ b/debian/patches/more_maxpathlen.patch
@@ -1,7 +1,7 @@
 Index: boinc/api/graphics2_util.cpp
 ===================================================================
---- boinc.orig/api/graphics2_util.cpp	2012-08-22 20:35:24.792922502 +0200
-+++ boinc/api/graphics2_util.cpp	2012-08-22 20:47:47.234849517 +0200
+--- boinc.orig/api/graphics2_util.cpp	2012-09-01 19:39:28.637343110 +0800
++++ boinc/api/graphics2_util.cpp	2012-09-01 19:40:48.401346216 +0800
 @@ -35,9 +35,9 @@
  
  #ifdef __EMX__
@@ -19,7 +19,7 @@ Index: boinc/api/graphics2_util.cpp
      int retval = boinc_get_init_data(aid);
      if (retval) aid.slot = 0;
 -    sprintf(shmem_name, "boinc_%s_%d", prog_name, aid.slot);
-+    snprintf(shmem_name, sizeof(shmem_name), "boinc_%s_%d", prog_name, aid.slot);
++    snprintf(shmem_name, MAXPATHLEN, "boinc_%s_%d", prog_name, aid.slot);
  }
  #endif
  
@@ -60,8 +60,8 @@ Index: boinc/api/graphics2_util.cpp
  #endif
 Index: boinc/lib/filesys.cpp
 ===================================================================
---- boinc.orig/lib/filesys.cpp	2012-08-22 20:46:19.264044088 +0200
-+++ boinc/lib/filesys.cpp	2012-08-22 20:46:19.528040503 +0200
+--- boinc.orig/lib/filesys.cpp	2012-09-01 19:40:04.725344515 +0800
++++ boinc/lib/filesys.cpp	2012-09-01 19:40:04.733344515 +0800
 @@ -209,7 +209,7 @@
  }
  
@@ -116,8 +116,8 @@ Index: boinc/lib/filesys.cpp
          strcpy(oldpath, newpath);
 Index: boinc/lib/network.cpp
 ===================================================================
---- boinc.orig/lib/network.cpp	2012-08-22 20:35:24.792922502 +0200
-+++ boinc/lib/network.cpp	2012-08-22 20:46:19.532040449 +0200
+--- boinc.orig/lib/network.cpp	2012-09-01 19:39:28.637343110 +0800
++++ boinc/lib/network.cpp	2012-09-01 19:40:04.733344515 +0800
 @@ -70,7 +70,7 @@
      case WSAENOTSOCK:
          return "not a socket";

-- 
BOINC packaging



More information about the pkg-boinc-commits mailing list