summaryrefslogtreecommitdiff
path: root/src/libical/sspm.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libical/sspm.c')
-rw-r--r--src/libical/sspm.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/libical/sspm.c b/src/libical/sspm.c
index 19ba011..b2b1dc2 100644
--- a/src/libical/sspm.c
+++ b/src/libical/sspm.c
@@ -46,9 +46,9 @@
#include "dmalloc.h"
#endif
-#ifdef WIN32
-#define snprintf _snprintf
-#define strcasecmp stricmp
+#if defined(_MSC_VER)
+#define snprintf _snprintf
+#define strcasecmp stricmp
#endif
#define TMP_BUF_SIZE 1024
@@ -181,7 +181,8 @@ char* sspm_get_parameter(const char* line, const char* parameter)
if(s != 0){
strncpy(name,p,(size_t)s-(size_t)p);
} else {
- strcpy(name,p);
+ strncpy(name,p,sizeof(name)-1);
+ name[sizeof(name)-1]='\0';
}
/* Strip off trailing quote, if it exists */
@@ -252,7 +253,7 @@ static const char *mime_headers[] = {
};
-void* sspm_default_new_part()
+void* sspm_default_new_part(void)
{
return 0;
}
@@ -472,6 +473,7 @@ enum sspm_minor_type sspm_find_minor_content_type(char* type)
char *p = strchr(ltype,'/');
if (p==0){
+ free(ltype);
return SSPM_UNKNOWN_MINOR_TYPE;
}
@@ -1594,7 +1596,7 @@ int sspm_write_mime(struct sspm_part *parts,size_t num_parts,
{
struct sspm_buffer buf;
int part_num =0;
- int slen;
+ size_t slen;
(void)num_parts;
buf.buffer = malloc(4096);