chl==NULLで落ちるバグを修正

diff --git a/PeerCast.root/PeerCast/core/common/servent.cpp b/PeerCast.root/PeerCast/core/common/servent.cpp
index 0d53331..7f15723 100644 (file)
--- a/PeerCast.root/PeerCast/core/common/servent.cpp
+++ b/PeerCast.root/PeerCast/core/common/servent.cpp
@@ -977,7 +977,7 @@ bool Servent::handshakeStream(ChanInfo &chanInfo)
                                                }*/
 
                                                ChanHitList *chl = chanMgr->findHitList(chanInfo);
-                                               ChanHit *hit = chl->hit;
+                                               ChanHit *hit = (chl ? chl->hit : NULL);
                                                while(hit){
                                                        if (hit->host.isValid() && (h.ip == hit->host.ip))
                                                        {

diff --git a/PeerCast.root/PeerCast/core/common/version2.h b/PeerCast.root/PeerCast/core/common/version2.h
index 5a17336..b316589 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; // VERSION_EX
 #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 = 37;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)";
+static const int  PCP_CLIENT_VERSION_EX_NUMBER = 38;
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)";
 
 static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
 #endif

diff --git a/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc b/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
index 8e3bea2..2ac10d2 100644 (file)
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
@@ -95,7 +95,7 @@ BEGIN
             MENUITEM "PeerCast",                    ID_POPUP_SHOWMESSAGES_PEERCAST
             MENUITEM "\94z\90M\8eÒ",                         ID_POPUP_SHOWMESSAGES_BROADCASTERS
             MENUITEM "\83g\83\89\83b\83N\8fî\95ñ",                      ID_POPUP_SHOWMESSAGES_TRACKINFO
-            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",                    ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
+            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",                    ID_POPUP_SHOWGUI, CHECKED, GRAYED
         END
         POPUP "\8d\82\93x"
         BEGIN

diff --git a/c:/Git/PeerCast.root/PeerCast/core/common/servent.cpp b/c:/Git/PeerCast.root/PeerCast/core/common/servent.cpp
index 0d53331..7f15723 100644 (file)
--- a/c:/Git/PeerCast.root/PeerCast/core/common/servent.cpp
+++ b/c:/Git/PeerCast.root/PeerCast/core/common/servent.cpp
@@ -977,7 +977,7 @@ bool Servent::handshakeStream(ChanInfo &chanInfo)
                                                }*/
 
                                                ChanHitList *chl = chanMgr->findHitList(chanInfo);
-                                               ChanHit *hit = chl->hit;
+                                               ChanHit *hit = (chl ? chl->hit : NULL);
                                                while(hit){
                                                        if (hit->host.isValid() && (h.ip == hit->host.ip))
                                                        {

diff --git a/c:/Git/PeerCast.root/PeerCast/core/common/version2.h b/c:/Git/PeerCast.root/PeerCast/core/common/version2.h
index 5a17336..b316589 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; // VERSION_EX
 #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 = 37;
-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)";
-static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)";
+static const int  PCP_CLIENT_VERSION_EX_NUMBER = 38;
+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)";
+static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)";
 
 static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
 #endif

diff --git a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
index 8e3bea2..2ac10d2 100644 (file)
--- a/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
+++ b/c:/Git/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
@@ -95,7 +95,7 @@ BEGIN
             MENUITEM "PeerCast",                    ID_POPUP_SHOWMESSAGES_PEERCAST
             MENUITEM "\94z\90M\8eÒ",                         ID_POPUP_SHOWMESSAGES_BROADCASTERS
             MENUITEM "\83g\83\89\83b\83N\8fî\95ñ",                      ID_POPUP_SHOWMESSAGES_TRACKINFO
-            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",                    ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
+            MENUITEM "\83A\83b\83v\83f\81[\83g\8fî\95ñ",                    ID_POPUP_SHOWGUI, CHECKED, GRAYED
         END
         POPUP "\8d\82\93x"
         BEGIN