MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-02 10:33:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle DMAP long type properly in dmap_add_field()

Browse Source
This commit is contained in:
Julien BLACHE 2010-02-02 21:03:00 +01:00
parent 58faeaceca
commit 1a3620d0a4
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/httpd_daap.c
View File

@ -490,19 +490,32 @@ dmap_find_field(uint32_t hash)
} }
static void static void
dmap_add_field(struct evbuffer *evbuf, struct dmap_field_map *dfm, char *strval, int intval) dmap_add_field(struct evbuffer *evbuf, struct dmap_field_map *dfm, char *strval, int32_t intval)
{ {
int64_t val64;
int32_t val; int32_t val;
int ret; int ret;
val = intval; if (strval && (dfm->type != DMAP_TYPE_STRING))
{
if ((dfm->type != DMAP_TYPE_STRING) && (val == 0) && strval) if (dfm->type == DMAP_TYPE_LONG)
{
ret = safe_atoi64(strval, &val64);
if (ret < 0)
val64 = 0;
}
else
{ {
ret = safe_atoi32(strval, &val); ret = safe_atoi32(strval, &val);
if (ret < 0) if (ret < 0)
val = 0; val = 0;
} }
}
else
{
val = intval;
val64 = intval;
}
switch (dfm->type) switch (dfm->type)
{ {
@ -524,9 +537,8 @@ dmap_add_field(struct evbuffer *evbuf, struct dmap_field_map *dfm, char *strval,
break; break;
case DMAP_TYPE_LONG: case DMAP_TYPE_LONG:
/* FIXME: "long" is thought of as a 64bit value */ if (val64)
if (val) dmap_add_long(evbuf, dfm->tag, val64);
dmap_add_long(evbuf, dfm->tag, val);
break; break;
case DMAP_TYPE_STRING: case DMAP_TYPE_STRING: