Jelajahi Sumber

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@467 54d463be-8e91-2dee-dedb-b68131a5f0ec

mc_cameri 20 tahun lalu
induk
melakukan
f4f4cdc584
3 mengubah file dengan 7 tambahan dan 4 penghapusan
  1. 1 0
      Changelog.txt
  2. 2 2
      Dev/bugs.txt
  3. 4 2
      src/login/login.c

+ 1 - 0
Changelog.txt

@@ -1,5 +1,6 @@
 Date	Added
 12/5
+	* Fixed bug in which login-txt was crashing in do_final() due to some free's [MC Cameri]
 	* Added nullpo's to all atcommand's functions, phew... [MC Cameri]
 	  Note: I point out that MouseJstr has added some @commands that start with char which
 	  havent been finished, they are just there but don't do anything.

+ 2 - 2
Dev/bugs.txt

@@ -71,8 +71,8 @@ Assigned:	N/A
 Progress:	0%
 
 Problem:	Login-Txt is now crashing when you close it using ^C, Ctrl+C(on windows), it only does that if login was connected with char-server.
-Assigned:	N/A
-Progress:	0
+Assigned:	MC Cameri
+Progress:	100%
 
 Problem:	Storm Gust doesn't freeze mobs / players
 Assigned:	N/A

+ 4 - 2
src/login/login.c

@@ -3867,7 +3867,8 @@ int flush_timer(int tid, unsigned int tick, int id, int data){
 //--------------------------------------
 void do_final(void) {
 	int i, fd;
-
+	printf("Terminating...\n");
+	fflush(stdout);
 	mmo_auth_sync();
 
 	if(auth_dat) free(auth_dat);
@@ -3881,7 +3882,7 @@ void do_final(void) {
 			memset(&server[i], 0, sizeof(struct mmo_char_server));
 			close(fd);
 			delete_session(fd);
-			if(session[fd]->session_data) free(session[fd]->session_data);
+			if(session[fd]) free(session[fd]);
 		}
 	}
 	close(login_fd);
@@ -3891,6 +3892,7 @@ void do_final(void) {
 
 	if(log_fp)
 		fclose(log_fp);
+	printf("Finished.\n");
 }
 
 //------------------------------