fix: parse url crash (#340) (DSP-1247)

dasch-swiss · Jan 22, 2021 · e710237 · e710237
1 parent 8c79a61
commit e710237
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/config/sipi.config.lua b/config/sipi.config.lua
@@ -214,12 +214,12 @@ admin = {
 
 fileserver = {
     --
-    -- directory where the documents for the normal webserver are located
+    -- directory on disk where the documents for the normal webserver are located
     --
     docroot = './server',
 
     --
-    -- route under which the normal webserver should respond to requests
+    -- URL route under which the normal webserver should respond to requests
     --
     wwwroute = '/server'
 }

diff --git a/server/do-upload.elua b/server/do-upload.elua
@@ -155,7 +155,7 @@ end
     end
     for imgindex,fn in pairs(newfilename) do
         server.print('<tr><td>', fn,
-            '</td><td><a href="', protocol, server.host, '/images/', fn, '/full/max/0/default.jpg"><img src="', protocol, server.host, '/images/', fn,'/full/,250/0/default.jpg" /></a></td></tr>')
+            '</td><td><a href="', protocol, server.host, '/images/', fn, '/full/max/0/default.jpg"><img src="', protocol, server.host, '/images/', fn,'/full/^,250/0/default.jpg" /></a></td></tr>')
     end
 
 </lua>

diff --git a/shttps/Hash.cpp b/shttps/Hash.cpp
@@ -31,7 +31,7 @@
 #include <sys/uio.h>
 #include <unistd.h>
 
-#include "SipiError.h"
+#include "Error.h"
 #include "Hash.h"
 #include "makeunique.h"
 
@@ -44,7 +44,7 @@ namespace shttps {
     Hash::Hash(HashType type) {
         context = EVP_MD_CTX_create();
         if (context == nullptr) {
-            throw Sipi::SipiError(__file__, __LINE__, "EVP_MD_CTX_create failed!");
+            throw Error(__file__, __LINE__, "EVP_MD_CTX_create failed!");
         }
         int status;
         switch (type) {
@@ -75,7 +75,7 @@ namespace shttps {
         }
         if (status != 1) {
             EVP_MD_CTX_destroy(context);
-            throw Sipi::SipiError(__file__, __LINE__, "EVP_DigestInit_ex failed!");
+            throw Error(__file__, __LINE__, "EVP_DigestInit_ex failed!");
         }
     }
     //==========================================================================

diff --git a/shttps/Server.cpp b/shttps/Server.cpp
@@ -649,6 +649,7 @@ namespace shttps {
         RequestHandler matching_handler = nullptr;
 
         for (item = handler[conn.method()].rbegin(); item != handler[conn.method()].rend(); ++item) {
+          //TODO:: Selects wrong handler if the URI starts with the substring
             size_t len = conn.uri().length() < item->first.length() ? conn.uri().length() : item->first.length();
 
             if (item->first == conn.uri().substr(0, len)) {

diff --git a/src/formats/SipiIOJ2k.cpp b/src/formats/SipiIOJ2k.cpp
@@ -768,13 +768,16 @@ namespace Sipi {
             int tw = 0, th = 0;
             if ((params != nullptr) && (!params->empty())) {
                 if (params->find(J2K_Stiles) != params->end()) {
+                    const int mindim = img->ny < img->nx ? img->ny : img->nx;
                     int n = std::sscanf(params->at(J2K_Stiles).c_str(), "{%d,%d}", &tw, &th);
                     if (n != 2) {
                         throw SipiImageError(__file__, __LINE__, "Tiling parameter invalid!");
                     }
-                    std::stringstream ss;
-                    ss << "Stiles=" << params->at(J2K_Stiles);
-                    siz.parse_string(ss.str().c_str());
+                    if ((mindim > tw) && (mindim > th)) {
+                      std::stringstream ss;
+                      ss << "Stiles=" << params->at(J2K_Stiles);
+                      siz.parse_string(ss.str().c_str());
+                    }
                 }
             } else {
                 const int mindim = img->ny < img->nx ? img->ny : img->nx;