Changeset 353

Timestamp:

Dec 28, 2009, 2:16:16 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

divers fix for Ticket #111 and memory leak in os2ea.c

Location:

branches/samba-3.3.x/source

Files:

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

branches/samba-3.3.x/source/VERSION

@@ -85 +85 @@
 #                                                      #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.1beta4"
 SAMBA_VERSION_VENDOR_PATCH=
 

branches/samba-3.3.x/source/include/version.h

@@ -4 +4 @@
 #define SAMBA_VERSION_RELEASE 9
 #define SAMBA_VERSION_OFFICIAL_STRING "3.3.9"
+#define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.1beta4"
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.3.x/source/lib/os2ea.c

@@ -310 +310 @@
                 free(pgea2list);
         }
-        if (pgea2list)
+        if (pfea2list)
         {
                 free(pfea2list);
@@ -380 +380 @@
                         }
                 }
+                // 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)
                 {