Import openssh_8.1p1.orig.tar.gz

1 files changed, 4 insertions, 2 deletions

diff --git a/moduli.c b/moduli.c
index 7120415fd..4f6f8da8d 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.34 2019/01/23 09:49:00 dtucker Exp $ */
+/* $OpenBSD: moduli.c,v 1.36 2019/10/04 03:26:58 dtucker Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -159,6 +159,8 @@ qfileout(FILE * ofile, u_int32_t otype, u_int32_t otests, u_int32_t otries,
 
         time(&time_now);
         gtm = gmtime(&time_now);
+        if (gtm == NULL)
+                return -1;
 
         res = fprintf(ofile, "%04d%02d%02d%02d%02d%02d %u %u %u %u %x ",
             gtm->tm_year + 1900, gtm->tm_mon + 1, gtm->tm_mday,
@@ -453,7 +455,7 @@ write_checkpoint(char *cpfile, u_int32_t lineno)
         int r;
 
         r = snprintf(tmp, sizeof(tmp), "%s.XXXXXXXXXX", cpfile);
-        if (r == -1 || r >= PATH_MAX) {
+        if (r < 0 || r >= PATH_MAX) {
                 logit("write_checkpoint: temp pathname too long");
                 return;
         }