Changeset 352 for branches/samba-3.0

Timestamp:

Dec 28, 2009, 12:31:14 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

divers fix for Ticket #111 in os2ea.c

Location:

branches/samba-3.0/source

Files:

• VERSION (modified) (1 diff)
• include/version.h (modified) (1 diff)
• lib/os2ea.c (modified) (1 diff)

branches/samba-3.0/source/VERSION

@@ -96 +96 @@
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.0.3-EATEST7-fix1"
-SAMBA_VERSION_VENDOR_PATCH=341
+SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.0.3"
+SAMBA_VERSION_VENDOR_PATCH=351

branches/samba-3.0/source/include/version.h

@@ -4 +4 @@
 #define SAMBA_VERSION_RELEASE 37
 #define SAMBA_VERSION_OFFICIAL_STRING "3.0.37"
-#define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.0.3-EATEST7-fix1"
-#define SAMBA_VERSION_VENDOR_PATCH 341
+#define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.0.3"
+#define SAMBA_VERSION_VENDOR_PATCH 351
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.0/source/lib/os2ea.c

@@ -379 +379 @@
                         }
                 }
+                // had to be added to avoid crash in case of broken extended attributes 
+                if (pfea->oNextEntryOffset > 0x10000)
+                {
+                        DEBUG(0, ("Broken Extended Attributes detected for: %s:%d\n", path ? path : "null", file));
+                        break;
+                }
                 if (!pfea->oNextEntryOffset)
                 {