Changeset 158299 in webkit


Ignore:
Timestamp:
Oct 30, 2013 12:03:45 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Remove PCRE workaround.
https://bugs.webkit.org/show_bug.cgi?id=123265

Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2013-10-30
Reviewed by Brent Fulgham.

  • wtf/text/StringStatics.cpp:

(WTF::StringImpl::empty):

Location:
trunk/Source/WTF
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r158282 r158299  
     12013-10-30  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
     2
     3        Remove PCRE workaround.
     4        https://bugs.webkit.org/show_bug.cgi?id=123265
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * wtf/text/StringStatics.cpp:
     9        (WTF::StringImpl::empty):
     10
    1112013-10-30  peavo@outlook.com  <peavo@outlook.com>
    212
  • trunk/Source/WTF/wtf/text/StringStatics.cpp

    r157943 r158299  
    4444StringImpl* StringImpl::empty()
    4545{
    46     // FIXME: This works around a bug in our port of PCRE, that a regular expression
    47     // run on the empty string may still perform a read from the first element, and
    48     // as such we need this to be a valid pointer. No code should ever be reading
    49     // from a zero length string, so this should be able to be a non-null pointer
    50     // into the zero-page.
    51     // Replace this with 'reinterpret_cast<UChar*>(static_cast<intptr_t>(1))' once
    52     // PCRE goes away.
    53     static LChar emptyLCharData = 0;
    54     DEFINE_STATIC_LOCAL(StringImpl, emptyString, (&emptyLCharData, 0, ConstructStaticString));
     46    DEFINE_STATIC_LOCAL(StringImpl, emptyString, (reinterpret_cast<UChar*>(static_cast<intptr_t>(8)), 0, ConstructStaticString));
    5547    WTF_ANNOTATE_BENIGN_RACE(&emptyString, "Benign race on StringImpl::emptyString reference counter");
    5648    return &emptyString;
Note: See TracChangeset for help on using the changeset viewer.