aboutsummaryrefslogtreecommitdiffstats
path: root/net/samba422/files/patch-source3_lib_util.c
diff options
context:
space:
mode:
authorLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
committerLexi Winter <ivy@FreeBSD.org>2025-12-01 03:19:41 +0000
commit2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch)
tree25f0138e1af8902b92dacc8cce09b267447c17db /net/samba422/files/patch-source3_lib_util.c
parentf85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff)
parent1a30da80670973368b399f2b01fe9c04b91a1273 (diff)
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'net/samba422/files/patch-source3_lib_util.c')
-rw-r--r--net/samba422/files/patch-source3_lib_util.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/net/samba422/files/patch-source3_lib_util.c b/net/samba422/files/patch-source3_lib_util.c
new file mode 100644
index 000000000000..cf5bae739144
--- /dev/null
+++ b/net/samba422/files/patch-source3_lib_util.c
@@ -0,0 +1,14 @@
+--- source3/lib/util.c.orig 2019-05-07 08:38:21 UTC
++++ source3/lib/util.c
+@@ -1916,7 +1916,10 @@ bool any_nt_status_not_ok(NTSTATUS err1,
+
+ int timeval_to_msec(struct timeval t)
+ {
+- return t.tv_sec * 1000 + (t.tv_usec+999) / 1000;
++ unsigned long result;
++
++ result = t.tv_sec * 1000 + (t.tv_usec+999) / 1000;
++ return result > INT_MAX ? INT_MAX : result;
+ }
+
+ /*******************************************************************