Skip to content
Snippets Groups Projects
Commit 62f78148 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Fix CID 32913

getkeys() could return -1 if user disconnects (and SS_ABORT not set), so this
appears to be a valid bug.
parent ecdec7d0
No related branches found
No related tags found
1 merge request!455Update branch with changes from master
...@@ -243,6 +243,8 @@ void sbbs_t::useredit(int usernumber) ...@@ -243,6 +243,8 @@ void sbbs_t::useredit(int usernumber)
while(online) { while(online) {
bprintf(text[FlagEditing], u32toaf(user.exempt,tmp)); bprintf(text[FlagEditing], u32toaf(user.exempt,tmp));
c=(char)getkeys("ABCDEFGHIJKLMNOPQRSTUVWXYZ?\r",0); c=(char)getkeys("ABCDEFGHIJKLMNOPQRSTUVWXYZ?\r",0);
if(c < 0)
break;
if(sys_status&SS_ABORT) if(sys_status&SS_ABORT)
break; break;
if(c==CR) break; if(c==CR) break;
...@@ -273,6 +275,8 @@ void sbbs_t::useredit(int usernumber) ...@@ -273,6 +275,8 @@ void sbbs_t::useredit(int usernumber)
break; break;
} }
c=(char)getkeys("ABCDEFGHIJKLMNOPQRSTUVWXYZ?1234\r",0); c=(char)getkeys("ABCDEFGHIJKLMNOPQRSTUVWXYZ?1234\r",0);
if(c < 0)
break;
if(sys_status&SS_ABORT) if(sys_status&SS_ABORT)
break; break;
if(c==CR) break; if(c==CR) break;
...@@ -522,6 +526,8 @@ void sbbs_t::useredit(int usernumber) ...@@ -522,6 +526,8 @@ void sbbs_t::useredit(int usernumber)
while(online) { while(online) {
bprintf(text[FlagEditing], u32toaf(user.rest, tmp)); bprintf(text[FlagEditing], u32toaf(user.rest, tmp));
c=(char)getkeys("ABCDEFGHIJKLMNOPQRSTUVWXYZ?\r",0); c=(char)getkeys("ABCDEFGHIJKLMNOPQRSTUVWXYZ?\r",0);
if(c < 0)
break;
if(sys_status&SS_ABORT) if(sys_status&SS_ABORT)
break; break;
if(c==CR) break; if(c==CR) break;
...@@ -1134,6 +1140,8 @@ void sbbs_t::maindflts(user_t* user) ...@@ -1134,6 +1140,8 @@ void sbbs_t::maindflts(user_t* user)
strcat(str,tmp); strcat(str,tmp);
} }
ch=(char)getkeys(str,0); ch=(char)getkeys(str,0);
if(ch < 0)
break;
if(sys_status & SS_ABORT) if(sys_status & SS_ABORT)
break; break;
if(ch==quit_key()) if(ch==quit_key())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment