artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

lib/m2: time: Fix segfault by allocating timeval struct.

Browse source 
Suggested by Meghan Denny <hello@nektro.net>.

* lib/m2/time.c (__tv): New global variable.
(time): Use it to allocate timeval struct.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2023-01-24 07:59:49 +01:00
parent c1f93c1d71
commit 1e14c26305
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/m2/time.c
View file

@ -1,6 +1,6 @@
/* -*-comment-start: "//";comment-end:""-*- /* -*-comment-start: "//";comment-end:""-*-
* GNU Mes --- Maxwell Equations of Software * GNU Mes --- Maxwell Equations of Software
* Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> * Copyright © 2018,2019,2022,2023 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
* *
* This file is part of GNU Mes. * This file is part of GNU Mes.
* *
@ -22,13 +22,16 @@
#include <arch/syscall.h> #include <arch/syscall.h>
#include <time.h> #include <time.h>
char *__tv;
long long
time (long* result) time (long* result)
{ {
int r; int r;
struct timeval tv; if (__tv == 0)
struct timezone tz; __tv = malloc (sizeof (struct timeval));
r = _sys_call2 (SYS_gettimeofday, tv, tz); struct timeval *tv = __tv;
r = _sys_call2 (SYS_gettimeofday, tv, 0);
if (r != 0) if (r != 0)
return -1; return -1;
if (result != 0) if (result != 0)