Skip to content

ext/intl: BreakIterator internals cleanup. #16516

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −21
Draft

ext/intl: BreakIterator internals cleanup. #16516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 8 additions & 21 deletions ext/intl/breakiterator/codepointiterator_internal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,6 @@

#include "php.h"

//copied from cmemory.h, which is not public
typedef union {
zend_long t1;
double t2;
void *t3;
} UAlignedMemory;

#define U_POINTER_MASK_LSB(ptr, mask) (((ptrdiff_t)(char *)(ptr)) & (mask))
#define U_ALIGNMENT_OFFSET(ptr) U_POINTER_MASK_LSB(ptr, sizeof(UAlignedMemory) - 1)
#define U_ALIGNMENT_OFFSET_UP(ptr) (sizeof(UAlignedMemory) - U_ALIGNMENT_OFFSET(ptr))

using namespace PHP;

using icu::UCharCharacterIterator;
Expand Down Expand Up @@ -239,21 +228,19 @@ CodePointBreakIterator *CodePointBreakIterator::createBufferClone(
}

if (bufferSize <= 0) {
bufferSize = sizeof(CodePointBreakIterator) + U_ALIGNMENT_OFFSET_UP(0);
bufferSize = sizeof(CodePointBreakIterator);
return NULL;
}

char *buf = (char*)stackBuffer;
uint32_t s = bufferSize;
uint32_t s = 0;

if (stackBuffer == NULL) {
s = 0;
}

if (U_ALIGNMENT_OFFSET(stackBuffer) != 0) {
uint32_t offsetUp = (uint32_t)U_ALIGNMENT_OFFSET_UP(buf);
s -= offsetUp;
buf += offsetUp;
if (stackBuffer) {
size_t newBufferSize = static_cast<size_t>(bufferSize);
if (std::align(alignof(CodePointBreakIterator), static_cast<size_t>(bufferSize), stackBuffer, newBufferSize)) {
bufferSize = static_cast<int32_t>(newBufferSize);
}
s = static_cast<uint32_t>(bufferSize);
}

if (s < sizeof(CodePointBreakIterator)) {
Expand Down