• R/O
  • HTTP
  • SSH
  • HTTPS

PeerCastIM: 提交


Commit MetaInfo

修訂21204ffbbf9b97b6d0e29080f7912fcf8996a6db (tree)
時間2009-07-05 22:48:26
作者eru <eru01@user...>
Commitereru

Log Message

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

Change Summary

差異

--- 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)
977977 }*/
978978
979979 ChanHitList *chl = chanMgr->findHitList(chanInfo);
980- ChanHit *hit = chl->hit;
980+ ChanHit *hit = (chl ? chl->hit : NULL);
981981 while(hit){
982982 if (hit->host.isValid() && (h.ip == hit->host.ip))
983983 {
--- 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
4444 #if 1 /* for VP extend version */
4545 //#define VERSION_EX 1
4646 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
47-static const int PCP_CLIENT_VERSION_EX_NUMBER = 37;
48-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)";
49-static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)";
47+static const int PCP_CLIENT_VERSION_EX_NUMBER = 38;
48+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)";
49+static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)";
5050
5151 static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
5252 #endif
--- a/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
+++ b/PeerCast.root/PeerCast/ui/win32/simple/Simple.rc
@@ -95,7 +95,7 @@ BEGIN
9595 MENUITEM "PeerCast", ID_POPUP_SHOWMESSAGES_PEERCAST
9696 MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS
9797 MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO
98- MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
98+ MENUITEM "アップデート情報", ID_POPUP_SHOWGUI, CHECKED, GRAYED
9999 END
100100 POPUP "高度"
101101 BEGIN
--- 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)
977977 }*/
978978
979979 ChanHitList *chl = chanMgr->findHitList(chanInfo);
980- ChanHit *hit = chl->hit;
980+ ChanHit *hit = (chl ? chl->hit : NULL);
981981 while(hit){
982982 if (hit->host.isValid() && (h.ip == hit->host.ip))
983983 {
--- 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
4444 #if 1 /* for VP extend version */
4545 //#define VERSION_EX 1
4646 static const char *PCP_CLIENT_VERSION_EX_PREFIX = "IM"; // 2bytes only
47-static const int PCP_CLIENT_VERSION_EX_NUMBER = 37;
48-static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0037)";
49-static const char *PCX_VERSTRING_EX = "v0.1218(IM0037)";
47+static const int PCP_CLIENT_VERSION_EX_NUMBER = 38;
48+static const char *PCX_AGENTEX = "PeerCast/0.1218(IM0038)";
49+static const char *PCX_VERSTRING_EX = "v0.1218(IM0038)";
5050
5151 static const char *PCP_CLIENT_DIST_URL = "http://peercastim.s353.xrea.com/";
5252 #endif
--- 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
9595 MENUITEM "PeerCast", ID_POPUP_SHOWMESSAGES_PEERCAST
9696 MENUITEM "配信者", ID_POPUP_SHOWMESSAGES_BROADCASTERS
9797 MENUITEM "トラック情報", ID_POPUP_SHOWMESSAGES_TRACKINFO
98- MENUITEM "アップデート情報", ID_POPUP_POPUPMESSAGES_UPGRADEALERTS, CHECKED, GRAYED
98+ MENUITEM "アップデート情報", ID_POPUP_SHOWGUI, CHECKED, GRAYED
9999 END
100100 POPUP "高度"
101101 BEGIN
Show on old repository browser