Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dfa6710 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Android (Google) Code Review
Browse files

Revert "Return the size of the buffer for validation" 

Revert submission 26299052-validate_hyphen_dict

Reason for revert: b/328903415

Reverted changes: /q/submissionid:26299052-validate_hyphen_dict

Change-Id: I07472cfd715ab92bb930f99fd61c0d11aa6bf2c4
parent 7a4b75a2

core/jni/android_text_Hyphenator.cpp

+10 −12
Original line number Diff line number Diff line
@@ -36,43 +36,41 @@ static std::string buildFileName(const std::string& locale) { 
    return SYSTEM_HYPHENATOR_PREFIX + lowerLocale + SYSTEM_HYPHENATOR_SUFFIX;

}



static std::pair<const uint8_t*, uint32_t> mmapPatternFile(const std::string& locale) {

static const uint8_t* mmapPatternFile(const std::string& locale) {

    const std::string hyFilePath = buildFileName(locale);

    const int fd = open(hyFilePath.c_str(), O_RDONLY | O_CLOEXEC);

    if (fd == -1) {

        return std::make_pair(nullptr, 0); // Open failed.

        return nullptr;  // Open failed.

    }



    struct stat st = {};

    if (fstat(fd, &st) == -1) {  // Unlikely to happen.

        close(fd);

        return std::make_pair(nullptr, 0);

        return nullptr;

    }



    void* ptr = mmap(nullptr, st.st_size, PROT_READ, MAP_SHARED, fd, 0 /* offset */);

    close(fd);

    if (ptr == MAP_FAILED) {

        return std::make_pair(nullptr, 0);

        return nullptr;

    }

    return std::make_pair(reinterpret_cast<const uint8_t*>(ptr), st.st_size);

    return reinterpret_cast<const uint8_t*>(ptr);

}



static void addHyphenatorWithoutPatternFile(const std::string& locale, int minPrefix,

        int minSuffix) {

    minikin::addHyphenator(locale,

                           minikin::Hyphenator::loadBinary(nullptr, 0, minPrefix, minSuffix,

                                                           locale));

    minikin::addHyphenator(locale, minikin::Hyphenator::loadBinary(

            nullptr, minPrefix, minSuffix, locale));

}



static void addHyphenator(const std::string& locale, int minPrefix, int minSuffix) {

    auto [ptr, size] = mmapPatternFile(locale);

    const uint8_t* ptr = mmapPatternFile(locale);

    if (ptr == nullptr) {

        ALOGE("Unable to find pattern file or unable to map it for %s", locale.c_str());

        return;

    }

    minikin::addHyphenator(locale,

                           minikin::Hyphenator::loadBinary(ptr, size, minPrefix, minSuffix,

                                                           locale));

    minikin::addHyphenator(locale, minikin::Hyphenator::loadBinary(

            ptr, minPrefix, minSuffix, locale));

}



static void addHyphenatorAlias(const std::string& from, const std::string& to) {