New upstream version 1.2.6

[sven/fuse-exfat.git] / libexfat / lookup.c

diff --git a/libexfat/lookup.c b/libexfat/lookup.c
index d5bb3899bd152ed16b07ed725a1fa3090249f833..4b27cc54e2679b201080b4c3ffa901147779309f 100644 (file)
--- a/libexfat/lookup.c
+++ b/libexfat/lookup.c
@@ -3,7 +3,7 @@
        exFAT file system implementation library.
 
        Free exFAT implementation.
        exFAT file system implementation library.
 
        Free exFAT implementation.

-       Copyright (C) 2010-2015  Andrew Nayenko
+       Copyright (C) 2010-2017  Andrew Nayenko

 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by


@@ -61,10 +61,7 @@ struct exfat_node* exfat_readdir(struct exfat* ef, struct exfat_iterator* it)
 
 static int compare_char(struct exfat* ef, uint16_t a, uint16_t b)
 {
 
 static int compare_char(struct exfat* ef, uint16_t a, uint16_t b)
 {

-       if (a >= ef->upcase_chars || b >= ef->upcase_chars)
-               return (int) a - (int) b;
-
-       return (int) le16_to_cpu(ef->upcase[a]) - (int) le16_to_cpu(ef->upcase[b]);
+       return (int) ef->upcase[a] - (int) ef->upcase[b];

 }
 
 static int compare_name(struct exfat* ef, const le16_t* a, const le16_t* b)
 }
 
 static int compare_name(struct exfat* ef, const le16_t* a, const le16_t* b)


@@ -89,7 +86,7 @@ static int lookup_name(struct exfat* ef, struct exfat_node* parent,
 
        *node = NULL;
 
 
        *node = NULL;
 

-       rc = utf8_to_utf16(buffer, name, EXFAT_NAME_MAX, n);
+       rc = utf8_to_utf16(buffer, name, EXFAT_NAME_MAX + 1, n);

        if (rc != 0)
                return rc;
 
        if (rc != 0)
                return rc;
 


@@ -197,7 +194,7 @@ int exfat_split(struct exfat* ef, struct exfat_node** parent,
                                exfat_put_node(ef, *parent);
                                return -ENOENT;
                        }
                                exfat_put_node(ef, *parent);
                                return -ENOENT;
                        }

-                       rc = utf8_to_utf16(name, p, EXFAT_NAME_MAX, n);
+                       rc = utf8_to_utf16(name, p, EXFAT_NAME_MAX + 1, n);

                        if (rc != 0)
                        {
                                exfat_put_node(ef, *parent);
                        if (rc != 0)
                        {
                                exfat_put_node(ef, *parent);