エラー落ちを修正

diff --git a/PeerCast.root/PeerCast/core/common/pcp.cpp b/PeerCast.root/PeerCast/core/common/pcp.cpp
index 48117ba..a7b47fb 100644 (file)
--- a/PeerCast.root/PeerCast/core/common/pcp.cpp
+++ b/PeerCast.root/PeerCast/core/common/pcp.cpp
@@ -769,9 +769,13 @@ int PCPStream::readBroadcastAtoms(AtomStream &atom,int numc,BroadcastState &bcs)
                                r = readAtom(patom,bcs);
                        } else {
                                char tmp[80], tmp2[80], tmp3[80];
+                               memset(tmp, 0, 80);
+                               memset(tmp2, 0, 80);
+                               memset(tmp3, 0, 80);
                                hit.uphost.toStr(tmp);
                                hit.host.toStr(tmp2);
-                               sv->getHost().toStr(tmp3);
+                               if (sv)
+                                       sv->getHost().toStr(tmp3);
                                LOG_DEBUG("### Invalid bcst: hops=%d, l/r = %d/%d, ver=%d(VP%04d), ttl=%d",
                                        bcs.numHops,hit.numListeners, hit.numRelays, ver,ver_vp,bcs.ttl);
                                LOG_DEBUG("### %s <- %s <- sv(%s)",

diff --git a/PeerCast.root/PeerCast/core/common/version2.h b/PeerCast.root/PeerCast/core/common/version2.h
index e6ac66c..72775ac 100644 (file)
--- a/PeerCast.root/PeerCast/core/common/version2.h
+++ b/PeerCast.root/PeerCast/core/common/version2.h
@@ -44,9 +44,9 @@ extern int version_ex; // PP
 #if 1 /* for VP extend version */
 //#define VERSION_EX 1
 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
-static const int  PCP_CLIENT_VERSION_EX_NUMBER = 29;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0029)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0029)";
+static const int  PCP_CLIENT_VERSION_EX_NUMBER = 30;
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0030)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0030)";
 #endif
 
 // ------------------------------------------------

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
index 2a5cc05..d86580e 100644 (file)
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -190,6 +190,7 @@
                                AdditionalLibraryDirectories=""C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release""
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile=".\Release/PeerCast.pdb"
+                               StripPrivateSymbols="PeerCast-dist.pdb"
                                GenerateMapFile="true"
                                SubSystem="2"
                                RandomizedBaseAddress="1"

diff --git a/c:/Git/PeerCast.root/PeerCast/core/common/pcp.cpp b/c:/Git/PeerCast.root/PeerCast/core/common/pcp.cpp
index 48117ba..a7b47fb 100644 (file)
--- a/c:/Git/PeerCast.root/PeerCast/core/common/pcp.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/pcp.cpp
@@ -769,9 +769,13 @@ int PCPStream::readBroadcastAtoms(AtomStream &atom,int numc,BroadcastState &bcs)
                                r = readAtom(patom,bcs);
                        } else {
                                char tmp[80], tmp2[80], tmp3[80];
+                               memset(tmp, 0, 80);
+                               memset(tmp2, 0, 80);
+                               memset(tmp3, 0, 80);
                                hit.uphost.toStr(tmp);
                                hit.host.toStr(tmp2);
-                               sv->getHost().toStr(tmp3);
+                               if (sv)
+                                       sv->getHost().toStr(tmp3);
                                LOG_DEBUG("### Invalid bcst: hops=%d, l/r = %d/%d, ver=%d(VP%04d), ttl=%d",
                                        bcs.numHops,hit.numListeners, hit.numRelays, ver,ver_vp,bcs.ttl);
                                LOG_DEBUG("### %s <- %s <- sv(%s)",

diff --git a/c:/Git/PeerCast.root/PeerCast/core/common/version2.h b/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
index e6ac66c..72775ac 100644 (file)
--- a/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
@@ -44,9 +44,9 @@ extern int version_ex; // PP
 #if 1 /* for VP extend version */
 //#define VERSION_EX 1
 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
-static const int  PCP_CLIENT_VERSION_EX_NUMBER = 29;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0029)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0029)";
+static const int  PCP_CLIENT_VERSION_EX_NUMBER = 30;
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0030)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0030)";
 #endif
 
 // ------------------------------------------------

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
index 2a5cc05..d86580e 100644 (file)
--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.vcproj
@@ -190,6 +190,7 @@
                                AdditionalLibraryDirectories=""C:\Visual Studio Projects\PeCa-IMAS7651\core\win32\lib\Release""
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile=".\Release/PeerCast.pdb"
+                               StripPrivateSymbols="PeerCast-dist.pdb"
                                GenerateMapFile="true"
                                SubSystem="2"
                                RandomizedBaseAddress="1"