Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PHPC-2429: Fix UTCDateTime with negative timestamps #1623

Merged
merged 3 commits into from
Sep 4, 2024
Merged

PHPC-2429: Fix UTCDateTime with negative timestamps #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3974587
PHPC-2429: Fix UTCDateTime with negative timestamps
alcaeus Sep 2, 2024
0f54fdf
Add missing include for llabs
alcaeus Sep 3, 2024
41e3b9a
Fix wrong version number in comment
alcaeus Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/BSON/UTCDateTime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

#include <math.h>
#include <inttypes.h>

#include <php.h>
#include <zend_smart_str.h>
Expand Down Expand Up @@ -213,8 +214,9 @@ static PHP_METHOD(MongoDB_BSON_UTCDateTime, toDateTime)
{
php_phongo_utcdatetime_t* intern;
php_date_obj* datetime_obj;
char* sec;
char* sec_str;
size_t sec_len;
int64_t sec, usec;

intern = Z_UTCDATETIME_OBJ_P(getThis());

Expand All @@ -223,11 +225,23 @@ static PHP_METHOD(MongoDB_BSON_UTCDateTime, toDateTime)
object_init_ex(return_value, php_date_get_date_ce());
datetime_obj = Z_PHPDATE_P(return_value);

sec_len = spprintf(&sec, 0, "@%" PRId64, intern->milliseconds / 1000);
php_date_initialize(datetime_obj, sec, sec_len, NULL, NULL, 0);
efree(sec);
sec = intern->milliseconds / 1000;
usec = (llabs(intern->milliseconds) % 1000) * 1000;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to include <inttypes.h> for this (see: cppreference). I imagine it may be included already through some sequence of libmongoc/php includes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. It worked without, but I've added an explicit include so we don't have to rely on other headers including this for us.

if (intern->milliseconds < 0 && usec != 0) {
/* For dates before the unix epoch, we need to subtract the microseconds from the timestamp.
* Since we can't directly pass microseconds when calling php_date_initialize due to a bug in PHP,
* we manually decrement the timestamp and subtract the number of microseconds from a full seconds
* to store in the us field. */
sec--;
usec = 1000000 - usec;
}

/* TODO PHP 8.1.7+: microseconds can be included in the format string */
sec_len = spprintf(&sec_str, 0, "@%" PRId64, sec);
php_date_initialize(datetime_obj, sec_str, sec_len, NULL, NULL, 0);
efree(sec_str);

datetime_obj->time->us = (intern->milliseconds % 1000) * 1000;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this code has worked for some time, but it does differ from the timestampms pattern case, which sets relative.us instead of us as we do here.

datetime_obj->time->us = usec;
}

static PHP_METHOD(MongoDB_BSON_UTCDateTime, jsonSerialize)
Expand Down
33 changes: 33 additions & 0 deletions tests/bson/bson-utcdatetime-todatetime-003.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
MongoDB\BSON\UTCDateTime::toDateTime() with dates before the Unix epoch
--INI--
date.timezone=UTC
--FILE--
<?php

$dates = [
'1960-01-01 12:12:12.1',
'1969-12-31 23:59:59.999',
];

foreach ($dates as $date) {
$dateTime = new \DateTimeImmutable($date);
echo $dateTime->format(DateTimeInterface::RFC3339_EXTENDED), PHP_EOL;

$utcDateTime = new MongoDB\BSON\UTCDateTime($dateTime);

$newDate = $utcDateTime->toDateTime();
echo $newDate->format(DateTimeInterface::RFC3339_EXTENDED), PHP_EOL, PHP_EOL;
}

?>
===DONE===
<?php exit(0); ?>
--EXPECT--
1960-01-01T12:12:12.100+00:00
1960-01-01T12:12:12.100+00:00

1969-12-31T23:59:59.999+00:00
1969-12-31T23:59:59.999+00:00

===DONE===
Loading