Merge branch 'stable'

* stable:
  CGIT 0.7.2
  Use GIT-1.5.3.8
  Compare string lengths when parsing the snapshot mask
  Default repo description to "[no description]"

1 files changed, 4 insertions, 3 deletions

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 4d1aa88..dfedd8f 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -130,7 +130,7 @@ int cgit_parse_snapshots_mask(const char *str)
 {
         const struct snapshot_archive_t* sat;
         static const char *delim = " \t,:/|;";
-        int f, tl, rv = 0;
+        int f, tl, sl, rv = 0;
 
         /* favor legacy setting */
         if(atoi(str))
@@ -142,8 +142,9 @@ int cgit_parse_snapshots_mask(const char *str)
                         break;
                 for(f=0; f<snapshot_archives_len; f++) {
                         sat = &snapshot_archives[f];
-                        if(!(strncmp(sat->suffix, str, tl) &&
-                             strncmp(sat->suffix+1, str, tl-1))) {
+                        sl = strlen(sat->suffix);
+                        if((tl == sl && !strncmp(sat->suffix, str, tl)) ||
+                           (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) {
                                 rv |= sat->bit;
                                 break;
                         }