Skip to content

Commit 99fa320

Browse files
author
Marek
committed
Fixed some warnings and possible overflows
1 parent 95d2af2 commit 99fa320

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

console.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ my_print(char *str)
8585
void c_refresh(void)
8686
{
8787
#ifdef SCREEN_BUFFERING
88-
write(1,screen_buffer,screen_buffer_pos);
88+
ssize_t ret = 0;
89+
ret = write(1,screen_buffer,screen_buffer_pos);
8990
screen_buffer_pos=0;
9091
#else
9192
fflush(stdout);
@@ -206,7 +207,7 @@ void c_sethlt_bg(unsigned char hlt,unsigned char bg)
206207
void c_setcolor_3b(unsigned char a)
207208
{
208209
char txt[8];
209-
snprintf(txt,16,"\033[%dm",30+(a&7));
210+
snprintf(txt,sizeof(txt),"\033[%dm",30+(a&7));
210211
my_print(txt);
211212
}
212213

kbd.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ int os2_read_mon(unsigned char *data, int len)
137137
int my_getchar(void)
138138
{
139139
unsigned char a;
140-
read(0,&a,1);
140+
ssize_t ret = 0;
141+
ret = read(0,&a,1);
141142
return a;
142143
}
143144

server.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -905,8 +905,8 @@ void send_message(struct player* player, char *name, char *msg)
905905
int len;
906906

907907
packet[0]=P_MESSAGE;
908-
if (!name){snprintf(packet+1,256,"%s",msg);len=strlen(msg)+1+1;}
909-
else {snprintf(packet+1,256,"%s> %s",name,msg);len=strlen(name)+strlen(msg)+1+3;}
908+
if (!name){snprintf(packet+1,sizeof(packet)-1,"%s",msg);len=strlen(msg)+1+1;}
909+
else {snprintf(packet+1,sizeof(packet)-1,"%s> %s",name,msg);len=strlen(name)+strlen(msg)+1+3;}
910910
send_chunk_packet_to_player(packet,len,player);
911911
}
912912

0 commit comments

Comments
 (0)