Merge pull request #200 from kiwix/new_version

New version 4.0.1
2026-01-04 20:38:05 -05:00 · 2019-02-22 11:18:55 +01:00 · 2019-02-22 10:29:16 +01:00 · 2019-02-19 14:15:20 +01:00 · 2019-02-19 14:05:37 +01:00 · 2019-02-19 14:05:08 +01:00
6 changed files with 16 additions and 7 deletions
--- a/7
+++ b/7
@@ -1,3 +1,10 @@
+kiwix-lib 4.0.1
+===============
+
+ * Fix "maybe uninitialize variable" issue.
+ * Ensure path are stored correctly (absolute path) in the library.
+ * [CI] Use the new deps archive xz
+
 kiwix-lib 4.0.0
 ===============

--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('kiwix-lib', 'cpp',
-  version : '4.0.0',
+  version : '4.0.1',
  license : 'GPL',
  default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

--- a/src/android/kiwixreader.cpp
+++ b/src/android/kiwixreader.cpp
@@ -91,7 +91,7 @@ Java_org_kiwix_kiwixlib_JNIKiwixReader_getId(JNIEnv* env, jobject obj)
 JNIEXPORT jint JNICALL
 Java_org_kiwix_kiwixlib_JNIKiwixReader_getFileSize(JNIEnv* env, jobject obj)
 {
-  jint size;
+  jint size = 0;

  try {
    int cSize = READER->getFileSize();
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -208,12 +208,16 @@ bool Manager::addBookFromPath(const std::string& pathToOpen,

 bool Manager::readBookFromPath(const std::string& path, kiwix::Book* book)
 {
+  std::string tmp_path = path;
+  if (isRelativePath(path)) {
+    tmp_path = computeAbsolutePath(getCurrentDirectory(), path);
+  }
  try {
-    kiwix::Reader reader(path);
+    kiwix::Reader reader(tmp_path);
    book->update(reader);
    book->setPathValid(true);
  } catch (const std::exception& e) {
-    std::cerr << "Invalid " << path << " : " << e.what() << std::endl;
+    std::cerr << "Invalid " << tmp_path << " : " << e.what() << std::endl;
    book->setPathValid(false);
    return false;
  }
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -241,8 +241,6 @@ Entry Reader::getMainPage() const
    throw NoEntry();
  }

-  string url = "";
-
  zim::Article article;
  if (this->zimFileHandler->getFileheader().hasMainPage())
  {
--- a/travis/install_deps.sh
+++ b/travis/install_deps.sh
@@ -3,7 +3,7 @@
 set -e

 REPO_NAME=${TRAVIS_REPO_SLUG#*/}
-ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
+ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.xz

 # Ninja
 cd $HOME
Author	SHA1	Message	Date
Matthieu Gautier	9aa1c65d7a	Merge pull request #200 from kiwix/new_version New version 4.0.1	2019-02-22 11:18:55 +01:00
Matthieu Gautier	ad6b20a530	New version 4.0.1	2019-02-22 10:29:16 +01:00
Matthieu Gautier	c1d04cc5b5	Merge pull request #199 from kiwix/fix_warning_android Correctly initialize variable.	2019-02-19 14:15:20 +01:00
Matthieu Gautier	af9734c87f	Correctly initialize variable.	2019-02-19 14:05:37 +01:00
Matthieu Gautier	a7a0798f99	Merge pull request #198 from kiwix/use_correct_dep_archive Use new xz archive.	2019-02-19 14:05:08 +01:00
Matthieu Gautier	0154fdd190	Use new xz archive.	2019-02-19 13:31:26 +01:00
Matthieu Gautier	788d16ec01	Merge pull request #197 from kiwix/ensure_path_abs Ensure path abs	2019-02-07 15:55:51 +01:00
Matthieu Gautier	35d812a5f7	Ensure the book's `path` is absolute. We must use absolute path whenever possible. Relative path has sense only related to the "interaction" with the user (current directory, library location, ...).	2019-02-07 15:22:33 +01:00
Matthieu Gautier	432f9c30a3	Remove unused variable url.	2019-02-07 15:20:18 +01:00