Changeset 191

Timestamp:

09/03/07 19:39:27 (15 months ago)

Author:

zany

Message:

fixing off-by-one and unfreed mem

Location:

trunk

Files:

• apps/obexftp.c (modified) (1 diff)
• obexftp/cache.c (modified) (5 diffs)
• obexftp/client.c (modified) (1 diff)

trunk/apps/obexftp.c

@@ -586 +586 @@
                                         st = obexftp_stat(cli, ent->name);
                                         if (!st) continue;
-                                        printf("%d %s (%d)\n", st->size, ent->name, ent->mode);
+                                        printf("%d %s%s\n", st->size, ent->name,
+                                                ent->mode&S_IFDIR?"/":"");
                                 }
                                 obexftp_closedir(dir);

trunk/obexftp/cache.c

@@ -110 +110 @@
                         if (node->content) \
                                 free(node->content); \
+                        if (node->stats) \
+                                free(node->stats); \
                         free(node); \
                         } while(0)
@@ -247 +249 @@
         Very limited - not multi-byte character save.
         It's actually "const char *xml" but can't be declared as such.
+        \return a new allocated array of stat_entry_t's.
  */
 static stat_entry_t *parse_directory(char *xml)
@@ -274 +277 @@
         ni = strlen(xml);
         no = ni;
-        xml_latin1 = xml_end = malloc(no);
+        xml_latin1 = xml_end = malloc(no+1);
         p = xml;
         if (xml_latin1) {
@@ -429 +432 @@
                 *p++ = '\0';
                 basename = p;
-        } else
+        } else {
+                *path = '\0';
                 basename = name;
+        }
         DEBUG(2, "%s() stating '%s' / '%s'\n", __func__, path, basename);
 
@@ -448 +453 @@
                 cache->stats = parse_directory(cache->content);
         DEBUG(2, "%s() got dir '%s'\n", __func__, path);
+        free(path);
         
         /* then lookup the basename */

trunk/obexftp/client.c

@@ -573 +573 @@
 
         OBEX_Cleanup(cli->obexhandle);
+        if (cli->buf_data) {
+                DEBUG(1, "%s: Warning: purging left-over buffer.\n", __func__);
+                free(cli->buf_data);
+        }
+        cache_purge(&cli->cache, NULL);
         free(cli->stream_chunk);
         free(cli);