- Merge from trunk

[reactos.git] / dll / win32 / msi / cond.y

diff --git a/dll/win32/msi/cond.y b/dll/win32/msi/cond.y
index f3db635..03ea493 100644 (file)
--- a/dll/win32/msi/cond.y
+++ b/dll/win32/msi/cond.y
@@ -347,7 +347,7 @@ symbol_s:
             COND_input* cond = (COND_input*) info;
             UINT len;
 
-            $$ = msi_dup_property( cond->package, $1 );
+            $$ = msi_dup_property( cond->package->db, $1 );
             if ($$)
             {
                 len = (lstrlenW($$) + 1) * sizeof (WCHAR);
@@ -462,11 +462,21 @@ static INT compare_substring( LPCWSTR a, INT operator, LPCWSTR b )
     case COND_LHS:
        return 0 == strncmpW( a, b, lstrlenW( b ) );
     case COND_RHS:
-       return 0 == lstrcmpW( a + (lstrlenW( a ) - lstrlenW( b )), b );
+    {
+        int l = lstrlenW( a );
+        int r = lstrlenW( b );
+        if (r > l) return 0;
+        return 0 == lstrcmpW( a + (l - r), b );
+    }
     case COND_ILHS:
        return 0 == strncmpiW( a, b, lstrlenW( b ) );
     case COND_IRHS:
-        return 0 == lstrcmpiW( a + (lstrlenW( a ) - lstrlenW( b )), b );
+    {
+        int l = lstrlenW( a );
+        int r = lstrlenW( b );
+        if (r > l) return 0;
+        return 0 == lstrcmpiW( a + (l - r), b );
+    }
     default:
        ERR("invalid substring operator\n");
         return 0;