raphael/ft_irc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

segfault in function JOIN Fixed

Browse source
This commit is contained in:
Samy BEN TAYEB 2025-06-18 00:20:54 +02:00
parent 2b3b6654e7
commit 150ada2f4e
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/channel.hpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/20 22:18:17 by rparodi #+# #+# */ /* Created: 2025/05/20 22:18:17 by rparodi #+# #+# */
/* Updated: 2025/06/17 23:38:49 by sben-tay ### ########.fr */ /* Updated: 2025/06/18 00:10:56 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -26,7 +26,7 @@ class Channel {
size_t getMaxUsers() const; size_t getMaxUsers() const;
User *getOwner() const; User *getOwner() const;
std::list<User *> getOperators() const; std::list<User *> getOperators() const;
std::list<User *> getUsers() const; std::list<User *>& getUsers();
std::list<User *> getInvited() const; std::list<User *> getInvited() const;
std::string getPassword() const; std::string getPassword() const;
bool isOperator(User *user) const; bool isOperator(User *user) const;

4
sources/channel/channel.cpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/20 22:43:24 by rparodi #+# #+# */ /* Created: 2025/05/20 22:43:24 by rparodi #+# #+# */
/* Updated: 2025/06/17 23:51:54 by sben-tay ### ########.fr */ /* Updated: 2025/06/18 00:10:48 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -48,7 +48,7 @@ User *Channel::getOwner() const {
* *
* @return list of Users in the channel * @return list of Users in the channel
*/ */
std::list<User *> Channel::getUsers() const { std::list<User *>& Channel::getUsers() {
return this->_users; return this->_users;
} }

3
sources/commands/join.cpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */ /* Created: 2025/05/24 17:29:48 by rparodi #+# #+# */
/* Updated: 2025/06/17 23:50:28 by sben-tay ### ########.fr */ /* Updated: 2025/06/17 23:55:31 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -89,5 +89,4 @@ void Join::execute() {
msg353 += (*it)->getNickname() + " "; msg353 += (*it)->getNickname() + " ";
} }
_cTarget->sendAllClientInAChannel(msgJoin + msg332 + msg353 + "\r\n"); _cTarget->sendAllClientInAChannel(msgJoin + msg332 + msg353 + "\r\n");
} }

13
sources/core/Server.cpp
View file

@ -6,7 +6,7 @@
/* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */ /* By: sben-tay <sben-tay@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/13 11:11:07 by rparodi #+# #+# */ /* Created: 2025/05/13 11:11:07 by rparodi #+# #+# */
/* Updated: 2025/06/17 23:16:55 by sben-tay ### ########.fr */ /* Updated: 2025/06/18 00:10:14 by sben-tay ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -185,7 +185,6 @@ void Server::printUsers() const
std::string Server::getPassword() const { return this->_password; } std::string Server::getPassword() const { return this->_password; }
std::list<User *> Server::getUsersList() const { std::list<User *> Server::getUsersList() const {
// to_delete when done
WARNING_MSG("TO DO FILL") WARNING_MSG("TO DO FILL")
std::list<User*> userList; std::list<User*> userList;
for (std::map<int, User*>::const_iterator it = _users.begin(); it != _users.end(); ++it) { for (std::map<int, User*>::const_iterator it = _users.begin(); it != _users.end(); ++it) {
@ -212,10 +211,10 @@ std::vector<std::string> splitLines(const std::string& input) {
} }
void Server::disconnectClient(int fd) { void Server::disconnectClient(int fd) {
_pollManager.removeClient(fd); User *user = _users[fd];
close(fd); for (std::list<Channel*>::iterator it = _channels.begin(); it != _channels.end(); ++it)
if (_users.count(fd)) { (*it)->removeUser(user);
delete _users[fd];
delete user;
_users.erase(fd); _users.erase(fd);
} }
}