Various picks from crengine-ng #504

poire-z · 2023-01-05T13:58:42Z

Various picks from @virxkane 's https://gitlab.com/coolreader-ng/crengine-ng .

(crengine-ng) Various small picks: unused variables, cast & types

Remove unused variables, fix types, more proper casts.

(crengine-ng) LVStream: minor fixes

ZIP64 minor fixes: when finding 'End of central directory record' don't try to lseek outside of file size.
LVPumpStream() function improved: added check result of write operation.
LVDeleteDirectory(): use rmdir instead of unlink.
Give a name to typedef struct ZipLocalFileHdr to avoir clang warning

From crengine-ng commits:
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/6e6655432e510f1ef7973e4923de974d7916e3d5
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/8e024f68b5ff6a17c4717539b0b7b1d63b831830
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/750751bbe67dc9d61c6d245c4b2fbe50eb92eddc
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/5c7db1c550ffcea9f8f296bac8f678d513202c88

(crengine-ng) LVStream: cleanup zip processing

ZIP processing: replaced hardcoded maximum entry name length and maximum extra entry data length with a new defines.
It is allowed to skip extra entry data if it is too long without stopping the processing of the zip archive.

From crengine-ng commit:
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/5473ebed8ae8b300ca5f1138a5d6ad41b8155723

(crengine-ng) ldomDataStorageManager: fix cast & types

From crengine-ng commit:
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/3ed32dd05d1d26c79ec3cc725e8a04f28e7ad984

(crengine-ng) ldomDataStorageManager: fix possible segfault

SIGSEGV fixed in ldomDataStorageManager class, AddressSanitizer: heap-use-after-free.
Fix cache emptying function.

From crengine-ng commits:
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/eaee261107221c46b759a68b527515c39b986c0f
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/1f3dc6b5395b29cc63297a6b5a6191ad0f1102fd

(crengine-ng) DOM/MathML: more currNode/parentNode sanity checks

From crengine-ng commit:
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/9f1032becb4f6ae765e30c356525227e24fe61a8

(crengine-ng) Default style: use cr3.ini fg & bg colors

ldomDocument default style: use text color and background color from document properties instead of black and white.
This fixes incorrect colors for mathml elements (fraction bar, sqrt symbol...) with non-standard color settings.

From crengine-ng commit:
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/aed17364d766a92b619e92d9a9da9b84cff2fd29

(crengine-ng) Support regular documents inside zip

LVDocView::loadDocumentInt(): allow to open '.fb3', '.epub', '.doc', '.docx', '*.odt' inside zip-archives.

From crengine-ng commit:
https://gitlab.com/coolreader-ng/crengine-ng/-/commit/d0be59c7a24063c6037e8a3bd25fe9f099553a9b

Silence some clang warnings

New warnings on old code that got to be checked by clang-tidy on this PR.

Stylesheets: support percent-encoded stylesheet links

Should allow closing koreader/koreader#10021

This change is

poire-z · 2023-01-05T14:02:33Z

I'll merge and bump this later, after KOReader v2023.01 is released (this weekend, right? :), and after a bump of crengine with @benoit-pierre 's recent commits, so we get 2 nightlies to help discriminate issues in case of any.

Frenzie · 2023-01-05T15:20:13Z

This weekend is the current plan. :-)

virxkane · 2023-01-05T16:40:19Z

@poire-z
Why didn't you use cherry-pick? So the authorship of commits is lost.
I've always moved your commits carefully, while saving your authorship. I hope you fix this.
Thank you.

@Frenzie
I hope I don't have to remind you as it was before?
buggins/coolreader#274 (comment)
But if @poire-z lost the authorship of the commits, will you remember who the real author is?
Thank you.

The copyright is copyright. And it must be respected.

I can't help but add, you ignored the license issue buggins/coolreader#338
I do not understand this buggins/coolreader#338 (comment)

If you develop software under a certain license, you need to know it, you need to comply with the requirements that it imposes and preferably recommendations.
All you need to do is change the wording of the license to GPLv2+ and make a complete list of authors. If there is a desire for each source file, but this is not necessary.
Thank you.

Happy New Year!

poire-z · 2023-01-05T17:06:31Z

Why didn't you use cherry-pick? So the authorship of commits is lost.

Because for most of the commits, I couldn't cherry pick, because our sources diverged and because of your ongoing split towards "one-file-per-class" - so I indeed did not git cherry-pick at all, and reported all your changes manually (and sometimes not all the changes contained in a single commit, just the ones that were interesting and were easy to apply).

Is it ok if I just change the owner of all these commits here to be you (even if it's not all your original commits and code, and possibly some adjustments by me - and that I merged some small ones?)

If you develop software under a certain license, you need to know it, you need to comply with the requirements that it imposes and preferably recommendations.

Well, we worked together for years without bothering a single time about that. The fact that you now bother is good for you, but let me code for fun in good spirit - and let my fellow @Frenzie and @NiLuJe guide me and tell me what to do about the legal stuff.

virxkane · 2023-01-05T17:17:15Z

@poire-z

Because for most of the commits, I couldn't cherry pick, because our sources diverged

It's not a problem. You do a cherry-pick, it ends in a conflict, you manually make changes just like you did here, then you do git cherry-pick --continue.

Is it ok if I just change the owner of all these commits here to be you

Or so, I don't mind.

Well, we worked together for years without bothering a single time about that.

Yes, sometimes we make mistakes, but it's still good to fix them.

NiLuJe · 2023-01-05T17:44:40Z

It's not a problem. You do a cherry-pick, it ends in a conflict, you manually make changes just like you did here, then you do git cherry-pick --continue.

Depending on the extent of the divergences, that can be considerably more annoying and error-prone work than just starting from scratch manually ;).

(Even with a good 3-way merge diff tool (i.e., Perforce's, as pretty much everything else pales in comparison (pun intended ;p)).

zwim · 2023-01-08T14:45:11Z

crengine/src/hyphman.cpp

+    if (words_in_file == 0) {
+        free(buf);
+        return USER_HYPH_DICT_MALFORMED;
+    }
+


This will only happen, if the user dict is empty (could happen, if a user deletes all entries) or only has one line without a trailing NL (which is not allowed by design and will also be considered as empty).

In both cases the frontend would try to load a user-dictionary (which is considered empty) and crengine should honor that attempt. That means release a previous loaded user-dict, free(buf) and report that the user-dict has been reloaded (even this means with an empty dictionary).

Therefore I would use:

if (words_in_file == 0) { free(buf); release(); return USER_HYPH_DICT_RELOAD; }

Thanks! Done.

Remove unused variables, fix types, more proper casts. From crengine-ng commits: 259e8e7a9951d74fa81b268c7117c24070d8b7cb a90ac8cc26fd1aefa9a33d11edecd6696578cbd5 3ed32dd05d1d26c79ec3cc725e8a04f28e7ad984 f9095b8aa773c1bcafa5ec0fb3b0cd4587feadbe 64ce6c2a8135841374f0f9338c29b753657a25c6 146fdd59a46958cda6a1cbce5e14c8f0a1bee845 2791906f7b59b9eb897f40b46c0053064f7ec9e1 116e5cf5d8e6fcf7233d939c501d009719f630af at https://gitlab.com/coolreader-ng/crengine-ng

- ZIP64 minor fixes: when finding 'End of central directory record' don't try to lseek outside of file size. - LVPumpStream() function improved: added check result of write operation. - LVDeleteDirectory(): use rmdir instead of unlink. - Give a name to typedef struct ZipLocalFileHdr to avoir clang warning From crengine-ng commits: 6e6655432e510f1ef7973e4923de974d7916e3d5 8e024f68b5ff6a17c4717539b0b7b1d63b831830 750751bbe67dc9d61c6d245c4b2fbe50eb92eddc 5c7db1c550ffcea9f8f296bac8f678d513202c88

ZIP processing: replaced hardcoded maximum entry name length and maximum extra entry data length with a new defines. It is allowed to skip extra entry data if it is too long without stopping the processing of the zip archive. From crengine-ng commit: 5473ebed8ae8b300ca5f1138a5d6ad41b8155723

From crengine-ng commit: 3ed32dd05d1d26c79ec3cc725e8a04f28e7ad984

- SIGSEGV fixed in ldomDataStorageManager class, AddressSanitizer: heap-use-after-free. - Fix cache emptying function. From crengine-ng commits: eaee261107221c46b759a68b527515c39b986c0f 1f3dc6b5395b29cc63297a6b5a6191ad0f1102fd

From crengine-ng commit: 9f1032becb4f6ae765e30c356525227e24fe61a8

ldomDocument default style: use text color and background color from document properties instead of black and white. This fixes incorrect colors for mathml elements (fraction bar, sqrt symbol...) with non-standard color settings. From crengine-ng commit: aed17364d766a92b619e92d9a9da9b84cff2fd29

LVDocView::loadDocumentInt(): allow to open '*.fb3', '*.epub', '*.doc', '*.docx', '*.odt' inside zip-archives. From crengine-ng commit: d0be59c7a24063c6037e8a3bd25fe9f099553a9b

poire-z force-pushed the crengine-ng_picks branch from 35a9c91 to 20e47a0 Compare January 5, 2023 14:59

poire-z force-pushed the crengine-ng_picks branch from 20e47a0 to c103661 Compare January 5, 2023 15:42

poire-z mentioned this pull request Jan 5, 2023

User hyphenation dictionary #439

Merged

poire-z force-pushed the crengine-ng_picks branch from c103661 to 146bd15 Compare January 5, 2023 17:27

zwim reviewed Jan 8, 2023

View reviewed changes

poire-z force-pushed the crengine-ng_picks branch from 146bd15 to 4d266b2 Compare January 8, 2023 14:58

poire-z mentioned this pull request Jan 12, 2023

Crash opening a book koreader/koreader#9961

Closed

poire-z force-pushed the crengine-ng_picks branch from 4d266b2 to 8e09d3a Compare January 21, 2023 17:09

virxkane and others added 10 commits January 21, 2023 18:14

(crengine-ng) ldomDataStorageManager: fix cast & types

e7a187b

From crengine-ng commit: 3ed32dd05d1d26c79ec3cc725e8a04f28e7ad984

(crengine-ng) ldomDataStorageManager: fix possible segfault

07cb262

- SIGSEGV fixed in ldomDataStorageManager class, AddressSanitizer: heap-use-after-free. - Fix cache emptying function. From crengine-ng commits: eaee261107221c46b759a68b527515c39b986c0f 1f3dc6b5395b29cc63297a6b5a6191ad0f1102fd

(crengine-ng) DOM/MathML: more currNode/parentNode sanity checks

46fcdc9

From crengine-ng commit: 9f1032becb4f6ae765e30c356525227e24fe61a8

(crengine-ng) Support regular documents inside zip

a720310

LVDocView::loadDocumentInt(): allow to open '*.fb3', '*.epub', '*.doc', '*.docx', '*.odt' inside zip-archives. From crengine-ng commit: d0be59c7a24063c6037e8a3bd25fe9f099553a9b

HyphMan: silence some clang warnings

ea5b8ba

Stylesheets: support percent-encoded stylesheet links

050e653

poire-z force-pushed the crengine-ng_picks branch from 8e09d3a to 050e653 Compare January 21, 2023 17:14

poire-z merged commit 3ff7558 into koreader:master Jan 21, 2023

poire-z deleted the crengine-ng_picks branch January 21, 2023 17:18

This was referenced Jan 23, 2023

bump crengine: various minor fixes and tweaks koreader/koreader-base#1575

Merged

bump crengine: various minor fixes and tweaks koreader/koreader#10044

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Various picks from crengine-ng #504

Various picks from crengine-ng #504

poire-z commented Jan 5, 2023 •

edited

poire-z commented Jan 5, 2023

Frenzie commented Jan 5, 2023

virxkane commented Jan 5, 2023 •

edited

poire-z commented Jan 5, 2023

virxkane commented Jan 5, 2023

NiLuJe commented Jan 5, 2023 •

edited

zwim Jan 8, 2023

poire-z Jan 8, 2023

Various picks from crengine-ng #504

Various picks from crengine-ng #504

Conversation

poire-z commented Jan 5, 2023 • edited

(crengine-ng) Various small picks: unused variables, cast & types

(crengine-ng) LVStream: minor fixes

(crengine-ng) LVStream: cleanup zip processing

(crengine-ng) ldomDataStorageManager: fix cast & types

(crengine-ng) ldomDataStorageManager: fix possible segfault

(crengine-ng) DOM/MathML: more currNode/parentNode sanity checks

(crengine-ng) Default style: use cr3.ini fg & bg colors

(crengine-ng) Support regular documents inside zip

Silence some clang warnings

Stylesheets: support percent-encoded stylesheet links

poire-z commented Jan 5, 2023

Frenzie commented Jan 5, 2023

virxkane commented Jan 5, 2023 • edited

poire-z commented Jan 5, 2023

virxkane commented Jan 5, 2023

NiLuJe commented Jan 5, 2023 • edited

zwim Jan 8, 2023

Choose a reason for hiding this comment

poire-z Jan 8, 2023

Choose a reason for hiding this comment

poire-z commented Jan 5, 2023 •

edited

virxkane commented Jan 5, 2023 •

edited

NiLuJe commented Jan 5, 2023 •

edited