Skip to content

Commit

Permalink
Fixed a double free on removing client (I think?)
Browse files Browse the repository at this point in the history
  • Loading branch information
Cliff Rowley committed Apr 13, 2008
1 parent ba5f278 commit 30c4102
Show file tree
Hide file tree
Showing 8 changed files with 688 additions and 620 deletions.
2 changes: 1 addition & 1 deletion ClientList.m
View file
Expand Up @@ -53,7 +53,7 @@ - (void)removeClient:(NSString*)clientId

if (client) {
[clients removeObject:client];
[client release];
//[client release]; - double free?!
}

if ([delegate respondsToSelector:@selector(clientList:clientRemoved:)]) {
Expand Down
93 changes: 20 additions & 73 deletions CocoaCollab.xcodeproj/crowley.mode1v3
View file
Expand Up @@ -202,32 +202,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>AD86505E0DB163B100F1C7A8</string>
<string>AD8650930DB188AF00F1C7A8</string>
<key>PBXProjectModuleLabel</key>
<string>SimpleController.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>AD86505F0DB163B100F1C7A8</string>
<string>AD8650940DB188AF00F1C7A8</string>
<key>PBXProjectModuleLabel</key>
<string>SimpleController.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>AD8650790DB1646500F1C7A8</string>
<string>AD8650950DB188AF00F1C7A8</string>
<key>history</key>
<array>
<string>AD8650770DB1646500F1C7A8</string>
<string>AD8650710DB1644400F1C7A8</string>
</array>
<key>prevStack</key>
<array>
<string>AD8650620DB163B100F1C7A8</string>
<string>AD8650630DB163B100F1C7A8</string>
<string>AD8650720DB1644400F1C7A8</string>
<string>AD8650780DB1646500F1C7A8</string>
<string>AD8650900DB1887800F1C7A8</string>
</array>
</dict>
<key>SplitCount</key>
Expand All @@ -246,54 +238,6 @@
<string>489 126 849 701 0 0 1440 878 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>AD8650650DB163B100F1C7A8</string>
<key>PBXProjectModuleLabel</key>
<string>OutputRenderer.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>AD8650660DB163B100F1C7A8</string>
<key>PBXProjectModuleLabel</key>
<string>OutputRenderer.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>AD86507A0DB1646500F1C7A8</string>
<key>history</key>
<array>
<string>AD8650670DB163B100F1C7A8</string>
<string>AD8650680DB163B100F1C7A8</string>
</array>
<key>prevStack</key>
<array>
<string>AD8650690DB163B100F1C7A8</string>
<string>AD86506A0DB163B100F1C7A8</string>
<string>AD86506B0DB163B100F1C7A8</string>
<string>AD86506C0DB163B100F1C7A8</string>
</array>
</dict>
<key>SplitCount</key>
<string>1</string>
</dict>
<key>StatusBarVisibility</key>
<true/>
</dict>
<key>Geometry</key>
<dict>
<key>Frame</key>
<string>{{0, 20}, {735, 641}}</string>
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
<string>567 131 735 682 0 0 1440 878 </string>
</dict>
</dict>
</array>
<key>PerspectiveWidths</key>
<array>
Expand Down Expand Up @@ -369,8 +313,8 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>4</integer>
<integer>0</integer>
<integer>9</integer>
<integer>8</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
Expand Down Expand Up @@ -612,10 +556,11 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>ADD8386C0D93B074007BCA95</string>
<string>AD8650650DB163B100F1C7A8</string>
<string>AD86505E0DB163B100F1C7A8</string>
<string>1C78EAAD065D492600B07095</string>
<string>/Users/crowley/Work/Personal/Cocoa/CocoaCollab/CocoaCollab.xcodeproj</string>
<string>AD8650930DB188AF00F1C7A8</string>
</array>
<key>WindowString</key>
<string>6 62 723 483 0 0 1440 878 </string>
Expand Down Expand Up @@ -784,7 +729,9 @@
<string>Value</string>
<real>85</real>
<string>Summary</string>
<real>279</real>
<real>192</real>
<string>Type</string>
<real>84</real>
</array>
<key>Frame</key>
<string>{{426, 0}, {509, 378}}</string>
Expand Down Expand Up @@ -815,13 +762,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>AD62E88F0DB09ECC00852E51</string>
<string>AD8650800DB1660500F1C7A8</string>
<string>1C162984064C10D400B95A72</string>
<string>AD62E8900DB09ECC00852E51</string>
<string>AD62E8910DB09ECC00852E51</string>
<string>AD62E8920DB09ECC00852E51</string>
<string>AD62E8930DB09ECC00852E51</string>
<string>AD62E8940DB09ECC00852E51</string>
<string>AD8650810DB1660500F1C7A8</string>
<string>AD8650820DB1660500F1C7A8</string>
<string>AD8650830DB1660500F1C7A8</string>
<string>AD8650840DB1660500F1C7A8</string>
<string>AD8650850DB1660500F1C7A8</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
Expand Down Expand Up @@ -977,7 +924,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>AD62E8950DB09ECC00852E51</string>
<string>AD8650860DB1660500F1C7A8</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
Expand All @@ -987,7 +934,7 @@
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
<false/>
<true/>
</dict>
<dict>
<key>Identifier</key>
Expand Down
83 changes: 66 additions & 17 deletions CocoaCollab.xcodeproj/crowley.pbxuser
View file
Expand Up @@ -19,7 +19,7 @@
breakpoints = (
AD64EA770D9B13B4005EF01D /* Client.m:95 */,
AD64EABC0D9B18BC005EF01D /* Client.m:95 */,
AD0330110DA23D050039A853 /* XMLSocket.m:57 */,
AD0330110DA23D050039A853 /* XMLSocket.m:60 */,
ADE285430DA5C399005D3B0A /* NullTerminatedTokenBuffer.m:29 */,
ADD88F490DAEFD6F00A7E7A9 /* SimpleController.m:180 */,
AD62E8B80DB0A1F400852E51 /* SimpleController.m:320 */,
Expand Down Expand Up @@ -126,6 +126,11 @@
AD8650780DB1646500F1C7A8 /* PBXTextBookmark */ = AD8650780DB1646500F1C7A8 /* PBXTextBookmark */;
AD8650790DB1646500F1C7A8 /* PBXTextBookmark */ = AD8650790DB1646500F1C7A8 /* PBXTextBookmark */;
AD86507A0DB1646500F1C7A8 /* PBXTextBookmark */ = AD86507A0DB1646500F1C7A8 /* PBXTextBookmark */;
AD86507E0DB1660500F1C7A8 /* PBXTextBookmark */ = AD86507E0DB1660500F1C7A8 /* PBXTextBookmark */;
AD86507F0DB1660500F1C7A8 /* PBXTextBookmark */ = AD86507F0DB1660500F1C7A8 /* PBXTextBookmark */;
AD8650880DB1661800F1C7A8 /* PBXTextBookmark */ = AD8650880DB1661800F1C7A8 /* PBXTextBookmark */;
AD8650900DB1887800F1C7A8 /* PBXBookmark */ = AD8650900DB1887800F1C7A8 /* PBXBookmark */;
AD8650950DB188AF00F1C7A8 /* PBXTextBookmark */ = AD8650950DB188AF00F1C7A8 /* PBXTextBookmark */;
};
sourceControlManager = ADD838550D93AA32007BCA95 /* Source Control */;
userBuildSettings = {
Expand Down Expand Up @@ -163,13 +168,13 @@
};
AD032EBB0DA1C8820039A853 /* SimpleController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {790, 5054}}";
sepNavSelRange = "{3129, 0}";
sepNavVisRange = "{2787, 865}";
sepNavIntBoundsRect = "{{0, 0}, {848, 4928}}";
sepNavSelRange = "{8440, 0}";
sepNavVisRange = "{7468, 1221}";
sepNavWindowFrame = "{{489, 70}, {849, 757}}";
};
};
AD0330110DA23D050039A853 /* XMLSocket.m:57 */ = {
AD0330110DA23D050039A853 /* XMLSocket.m:60 */ = {
isa = PBXFileBreakpoint;
actions = (
);
Expand All @@ -181,7 +186,7 @@
functionName = "-nullTerminatedTokenBuffer:tokenAvailable:";
hitCount = 0;
ignoreCount = 0;
lineNumber = 57;
lineNumber = 60;
location = CocoaCollab;
modificationTime = 229679886.91683;
state = 2;
Expand Down Expand Up @@ -497,19 +502,63 @@
vrLen = 1191;
vrLoc = 2741;
};
AD86507E0DB1660500F1C7A8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = AD032EBB0DA1C8820039A853 /* SimpleController.m */;
name = "SimpleController.m: 134";
rLen = 0;
rLoc = 3130;
rType = 0;
vrLen = 865;
vrLoc = 2787;
};
AD86507F0DB1660500F1C7A8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = ADD88FB00DB0099C00A7E7A9 /* OutputRenderer.m */;
name = "OutputRenderer.m: 136";
rLen = 0;
rLoc = 3842;
rType = 0;
vrLen = 1191;
vrLoc = 2741;
};
AD8650880DB1661800F1C7A8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = ADD88FB00DB0099C00A7E7A9 /* OutputRenderer.m */;
name = "OutputRenderer.m: 136";
rLen = 0;
rLoc = 3842;
rType = 0;
vrLen = 1188;
vrLoc = 2741;
};
AD8650900DB1887800F1C7A8 /* PBXBookmark */ = {
isa = PBXBookmark;
fRef = AD032EBB0DA1C8820039A853 /* SimpleController.m */;
};
AD8650950DB188AF00F1C7A8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = AD032EBB0DA1C8820039A853 /* SimpleController.m */;
name = "SimpleController.m: 340";
rLen = 0;
rLoc = 8440;
rType = 0;
vrLen = 1221;
vrLoc = 7468;
};
ADADD50D0DA04C0000874171 /* XMLSocket.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {786, 597}}";
sepNavSelRange = "{214, 0}";
sepNavVisRange = "{0, 654}";
sepNavWindowFrame = "{{44, 73}, {845, 725}}";
sepNavIntBoundsRect = "{{0, 0}, {786, 574}}";
sepNavSelRange = "{186, 0}";
sepNavVisRange = "{0, 679}";
sepNavWindowFrame = "{{85, 47}, {845, 725}}";
};
};
ADADD50E0DA04C0000874171 /* XMLSocket.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {786, 966}}";
sepNavSelRange = "{988, 0}";
sepNavVisRange = "{543, 891}";
sepNavIntBoundsRect = "{{0, 0}, {786, 1036}}";
sepNavSelRange = "{1484, 0}";
sepNavVisRange = "{0, 800}";
sepNavWindowFrame = "{{85, 47}, {845, 725}}";
};
};
Expand Down Expand Up @@ -603,8 +652,8 @@
ADD88FB00DB0099C00A7E7A9 /* OutputRenderer.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {812, 2000}}";
sepNavSelRange = "{3842, 0}";
sepNavVisRange = "{2741, 1191}";
sepNavSelRange = "{3200, 0}";
sepNavVisRange = "{2741, 1090}";
sepNavWindowFrame = "{{567, 75}, {735, 738}}";
};
};
Expand Down Expand Up @@ -656,8 +705,8 @@
ADE283D40DA4E20D005D3B0A /* ClientList.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {790, 910}}";
sepNavSelRange = "{479, 0}";
sepNavVisRange = "{260, 858}";
sepNavSelRange = "{994, 0}";
sepNavVisRange = "{355, 789}";
sepNavWindowFrame = "{{45, 40}, {849, 757}}";
};
};
Expand Down

0 comments on commit 30c4102

Please sign in to comment.