Skip to content

Bump the vendored engine to eddf187c, engine master #265

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

Merged
xroche merged 2 commits into from
Oct 28, 2026
Merged

Bump the vendored engine to eddf187c, engine master #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
838c40c
Bump the vendored engine to eddf187c, engine master
xroche Oct 28, 2026
1093370
Pin the read-back's own guard, not the text after it
xroche Oct 28, 2026
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
2 changes: 1 addition & 1 deletion app/src/main/jni/httrack
Open in desktop
Submodule httrack updated 106 files
21 changes: 14 additions & 7 deletions app/src/test/java/com/httrack/android/BrowserLoginEngineLimitsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,24 @@ public void theCapsKeepEveryLineUnderTheEnginesLineMax() throws IOException {
*/
@Test
public void theBundleWriterIsAnExportedEngineCallThatReadsItsOwnOutputBack() throws IOException {
assertTrue("the JNI calls the flags entry point now, so this test reads the wrong function",
TestSources.read(TestSources.mainFile("jni/htslibjni.c")).contains(
"hts_bundle_from_paste(paste, folder, agent, url"));
assertTrue("hts_bundle_from_paste is no longer exported",
source("httrack-library.h").contains("HTSEXT_API hts_boolean hts_bundle_from_paste("));
final String paste = source("htsbundle.c");
// Inside that function, not anywhere in the file, and the failure has to stop the write.
final String body = TestSources.balancedBlock(paste,
final String wrapper = TestSources.balancedBlock(paste,
TestSources.indexOf(paste, "HTSEXT_API hts_boolean hts_bundle_from_paste("));
final int read = body.indexOf("bundle_load_src(opt, &check, &src");
assertTrue(body, read != -1);
assertTrue(body, body.startsWith("if (!", body.lastIndexOf("if (!", read)));
assertTrue(body, body.indexOf("PASTE_FAIL", read) != -1);
assertTrue(body, body.indexOf("cookie_write_replace", read) > read);
assertTrue(wrapper, wrapper.contains("return hts_bundle_from_paste_flags("));
final String body = TestSources.balancedBlock(paste,
TestSources.indexOf(paste, "HTSEXT_API hts_boolean hts_bundle_from_paste_flags("));
// Failing has to be the guard's whole statement, or a bundle the read-back rejected still
// reaches the folder.
final int read = TestSources.indexOf(body, "!bundle_load_src(");
final int ends = body.indexOf(';', read);
final String guard = body.substring(read, ends + 1).replaceAll("\\s+", " ");
assertTrue(guard, guard.matches("!bundle_load_src\\(.*\\)\\) PASTE_FAIL\\(.*;"));
assertTrue(body, body.indexOf("cookie_write_replace") > ends);
}

/** Our file has to leave the mirror's own cookies.txt room in the same jar. */
Expand Down
Loading