From e50ab97929d7fc9866a324d202433098301cdf07 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 6 Jul 2006 04:32:37 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=10585
---
 checkin_notes          | 8 ++++++++
 client/cs_benchmark.C  | 9 +++++----
 doc/contact.php        | 1 +
 doc/create_project.php | 1 +
 doc/fortran.php        | 5 +++--
 doc/web_config.php     | 2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index ddf1d9a09a..a5b7099fb8 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7264,3 +7264,11 @@ Rom    5 July 2006
     clientgui/
         AdvancedFrame.cpp
         BOINCTaskBar.cpp, .h
+
+David  5 July 2006
+    - core client: fix bug where we write past the end of
+        benchmark_desc array if ncpus increases
+        (from Don Mullis)
+
+    client/
+        cs_benchmark.C
diff --git a/client/cs_benchmark.C b/client/cs_benchmark.C
index be67c14055..a4b0fb6408 100644
--- a/client/cs_benchmark.C
+++ b/client/cs_benchmark.C
@@ -192,11 +192,12 @@ void CLIENT_STATE::start_cpu_benchmarks() {
     remove_benchmark_file(BM_TYPE_INT);
     cpu_benchmarks_start = dtime();
 
-    if (!benchmark_descs) {
-        benchmark_descs = (BENCHMARK_DESC*)calloc(
-            ncpus, sizeof(BENCHMARK_DESC)
-        );
+    if (benchmark_descs) {
+        free(benchmark_descs);
     }
+    benchmark_descs = (BENCHMARK_DESC*)calloc(
+        ncpus, sizeof(BENCHMARK_DESC)
+    );
     benchmarks_running = true;
 
     for (i=0; i<ncpus; i++) {
diff --git a/doc/contact.php b/doc/contact.php
index 8241417421..136795a16f 100644
--- a/doc/contact.php
+++ b/doc/contact.php
@@ -159,6 +159,7 @@ show_name("Christopher Malton");
 show_name("Sebastian Masch");
 show_name("John McLeod VII");
 show_name("Kenichi Miyoshi");
+show_name("Don Mullis");
 show_name("Tony Murray");
 show_name("Eric Myers");
 show_name("Harold Naparst");
diff --git a/doc/create_project.php b/doc/create_project.php
index 17740a20b8..449de7a2d5 100644
--- a/doc/create_project.php
+++ b/doc/create_project.php
@@ -134,6 +134,7 @@ Web site
 Miscellaneous
 </b></font>
 <ul>
+<li> <a href=mass_email.php>Sending mass emails</a>
 <li> <a href=gui_urls.php>Project-specific items in the client GUI</a>
 <li> <a href=db_dump.php#task>Export credit data as XML</a>
 <li> <a href=grid.php>Integrating BOINC projects with Grids</a>
diff --git a/doc/fortran.php b/doc/fortran.php
index 0e70d2c7cc..76dd9413b4 100644
--- a/doc/fortran.php
+++ b/doc/fortran.php
@@ -7,8 +7,9 @@ page_head("FORTRAN applications");?>
 Include the file 'boinc_api_fortran.C' in the api/Makefile.am,
 but comment out the 'zip' calls, to avoid the linking with 'libboinc_zip.a' 
 <p>
-To link is necessary to add the 'winmm.dll' (-lwinmm).
-<h2>Windows: Visual Developer Studio</h2>
+To link it is necessary to include the 'winmm.dll' library (-lwinmm).
+
+<h2>Windows: Visual Studio</h2>
 
 <p><font color=red>2004-06-16 note: this page is outdated; will update
     (functions are now declared <code>extern"C"</code> so
diff --git a/doc/web_config.php b/doc/web_config.php
index aaba3415da..b79bc86ac0 100644
--- a/doc/web_config.php
+++ b/doc/web_config.php
@@ -52,7 +52,7 @@ list_item("SYS_ADMIN_EMAIL", "Users are directed here if they
 ");
 list_item("FORUM_MODERATION_EMAIL_USER_ID",
     "Moderation-related emails (such as user complaints) are sent here.
-")
+");
 list_item("INVITE_CODES", "regular expression used for
     <a href=account_control.php>controlling account creation</a>.
 ");