Imported Upstream version 0.6.23

[platform/upstream/libsolv.git] / src / evr.c

diff --git a/src/evr.c b/src/evr.c
index e8fd12d..a7d4311 100644 (file)
--- a/src/evr.c
+++ b/src/evr.c
@@ -242,7 +242,7 @@ solv_cmp_version_part_haiku(const char *s1, const char *q1, const char *s2,
 
       while (part1 + 1 < s1 && *part1 == '0')
         part1++;
-      while (part2 + 1 < s1 && *part2 == '0')
+      while (part2 + 1 < s2 && *part2 == '0')
         part2++;
 
       len1 = s1 - part1;
@@ -284,13 +284,14 @@ solv_vercmp_haiku(const char *s1, const char *q1, const char *s2, const char *q2
   if (pre2 == q2)
     return -1;
 
-  return solv_cmp_version_part_haiku(pre1 + 1, q1, pre2 + 1, q2);
+  cmp = solv_cmp_version_part_haiku(pre1 + 1, q1, pre2 + 1, q2);
+  return cmp == 0 ? 0 : cmp < 0 ? -1 : 1; /* must return -1, 0, or 1 */
 }
 
 #endif /* HAIKU */
- 
- 
-/* 
+
+
+/*
  * the solv_vercmp variant your system uses.
  */
 int