# BUILD : 1.7.14 (1106) # BUGS : # NOTES : applied heinz's fix for the gcc hardened issue

git-svn-id: svn://svn.anope.org/anope/trunk@1106 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@830 5417fbe8-f217-4b02-8779-1006273d7864

src/main.c

@@ -557,7 +557,6 @@ int main(int ac, char **av, char **envp)
 
     /* We have a line left over from earlier, so process it first. */
     process();
-
 
     /* Set up timers. */
     last_update = time(NULL);
@@ -599,13 +598,13 @@ int main(int ac, char **av, char **envp)
             resetDefCon(5);
             last_DefCon = t;
         }
-
-        if (delayed_quit)
-            break;
+
+        if (delayed_quit)
+            break;
 
-        moduleCallBackRun();
+        moduleCallBackRun();
 
-        waiting = -1;
+        waiting = -1;
         if (t - last_check >= TimeoutCheck) {
             check_timeouts();
             last_check = t;

src/sockutil.c

@@ -453,7 +453,7 @@ char *sgets2(char *buf, int len, ano_socket_t s)
     char *str = sgets(buf, len, s);
 
     if (!str || str == (char *) -1)
-        return NULL;
+        return str;
     str = buf + strlen(buf) - 1;
     if (*str == '\n')
         *str-- = 0;

version.log

@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="14"
 VERSION_EXTRA=""
-VERSION_BUILD="1105"
+VERSION_BUILD="1106"
 
 # $Log$
 #
+# BUILD : 1.7.14 (1106)
+# BUGS  :
+# NOTES : applied heinz's fix for the gcc hardened issue
+#
 # BUILD : 1.7.14 (1105)
 # BUGS  : 558
 # NOTES : fixed usermode stuff for ratbox and shadow